diff --git a/.vscode/settings.json b/.vscode/settings.json index f830213bb0..af077036c9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -40,7 +40,7 @@ // C++ "lldb.verboseLogging": false, "cmake.configureOnOpen": false, - "C_Cpp.errorSquiggles": "enabled", + "C_Cpp.errorSquiggles": "enabled", "[cpp]": { "editor.defaultFormatter": "xaver.clang-format" }, @@ -55,7 +55,7 @@ "prettier.enable": true, "eslint.workingDirectories": ["${workspaceFolder}/packages/bun-types"], "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[javascriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -72,12 +72,12 @@ // JSON "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[jsonc]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.defaultFormatter": "esbenp.prettier-vscode" }, - + // Markdown "[markdown]": { "editor.defaultFormatter": "esbenp.prettier-vscode", @@ -94,12 +94,17 @@ // TOML "[toml]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.defaultFormatter": "esbenp.prettier-vscode" }, // YAML "[yaml]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + + // Dockerfile + "[dockerfile]": { + "editor.formatOnSave": false }, // Files @@ -148,5 +153,5 @@ "WebKit/WebDriver": true, "WebKit/WebKitBuild": true, "WebKit/WebInspectorUI": true - }, + } } diff --git a/dockerhub/alpine/Dockerfile b/dockerhub/alpine/Dockerfile index 4051cf17d9..79e10e2841 100644 --- a/dockerhub/alpine/Dockerfile +++ b/dockerhub/alpine/Dockerfile @@ -96,6 +96,9 @@ FROM alpine:3.18 ARG BUN_RUNTIME_TRANSPILER_CACHE_PATH=0 ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=${BUN_RUNTIME_TRANSPILER_CACHE_PATH} +ARG BUN_INSTALL_BIN=/usr/local/bin +ENV BUN_INSTALL_BIN=${BUN_INSTALL_BIN} + COPY --from=build /usr/local/bin/bun /usr/local/bin/ COPY docker-entrypoint.sh /usr/local/bin/ diff --git a/dockerhub/debian-slim/Dockerfile b/dockerhub/debian-slim/Dockerfile index babe2d7a57..c26352eec5 100644 --- a/dockerhub/debian-slim/Dockerfile +++ b/dockerhub/debian-slim/Dockerfile @@ -62,6 +62,9 @@ FROM debian:bullseye-slim ARG BUN_RUNTIME_TRANSPILER_CACHE_PATH=0 ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=${BUN_RUNTIME_TRANSPILER_CACHE_PATH} +ARG BUN_INSTALL_BIN=/usr/local/bin +ENV BUN_INSTALL_BIN=${BUN_INSTALL_BIN} + COPY docker-entrypoint.sh /usr/local/bin COPY --from=build /usr/local/bin/bun /usr/local/bin/bun diff --git a/dockerhub/debian/Dockerfile b/dockerhub/debian/Dockerfile index f8d147cc90..e17da98e21 100644 --- a/dockerhub/debian/Dockerfile +++ b/dockerhub/debian/Dockerfile @@ -63,6 +63,9 @@ COPY --from=build /usr/local/bin/bun /usr/local/bin/bun ARG BUN_RUNTIME_TRANSPILER_CACHE_PATH=0 ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=${BUN_RUNTIME_TRANSPILER_CACHE_PATH} +ARG BUN_INSTALL_BIN=/usr/local/bin +ENV BUN_INSTALL_BIN=${BUN_INSTALL_BIN} + RUN groupadd bun \ --gid 1000 \ && useradd bun \ diff --git a/dockerhub/distroless/Dockerfile b/dockerhub/distroless/Dockerfile index adf339bdfe..3ee9cb34f8 100644 --- a/dockerhub/distroless/Dockerfile +++ b/dockerhub/distroless/Dockerfile @@ -62,6 +62,9 @@ FROM gcr.io/distroless/base-nossl-debian11 ARG BUN_RUNTIME_TRANSPILER_CACHE_PATH=0 ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=${BUN_RUNTIME_TRANSPILER_CACHE_PATH} +ARG BUN_INSTALL_BIN=/usr/local/bin +ENV BUN_INSTALL_BIN=${BUN_INSTALL_BIN} + COPY --from=build /usr/local/bin/bun /usr/local/bin/ # Temporarily use the `build`-stage image binaries to create a symlink: