diff options
| author |  João Paquim <jpaquim@users.noreply.github.com>
| 2022-11-03 00:34:20 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-11-02 17:34:20 -0700 |
| commit | dd9325d8c9ef79096cd133ad053714d3ea014e08 (patch) | |
| tree | 4ff529951f517552ebe2a9f057fee2bab5c6df66 | |
| parent | 3b7626aacbf2973c58f7215c20da40b8a2c83ff2 (diff) | |
| download | bun-dd9325d8c9ef79096cd133ad053714d3ea014e08.tar.gz bun-dd9325d8c9ef79096cd133ad053714d3ea014e08.tar.zst bun-dd9325d8c9ef79096cd133ad053714d3ea014e08.zip | |
Fix $PATH on dev container (#1439)
* Fix $PATH for bun on devcontainer
* Use cat in dev container postCreateCommand
| -rw-r--r-- | .devcontainer/devcontainer.json | 2 | ||||
| -rw-r--r-- | Dockerfile.devcontainer | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 23a0b3995..9d9a4c5b8 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -27,7 +27,7 @@ "esbenp.prettier-vscode", "xaver.clang-format" ], - "postCreateCommand": "cd /build/bun; bash /build/getting-started.sh; code /build/README.md", + "postCreateCommand": "cd /build/bun; bash /build/getting-started.sh; cat /build/README.md", "build": { "target": "bun.devcontainer", diff --git a/Dockerfile.devcontainer b/Dockerfile.devcontainer index 81f666cc8..18a1146a8 100644 --- a/Dockerfile.devcontainer +++ b/Dockerfile.devcontainer @@ -6,6 +6,7 @@ ARG WEBKIT_DIR=${GITHUB_WORKSPACE}/bun-webkit ARG BUN_RELEASE_DIR=${GITHUB_WORKSPACE}/bun-release ARG BUN_DEPS_OUT_DIR=${GITHUB_WORKSPACE}/bun-deps ARG BUN_DIR=${GITHUB_WORKSPACE}/bun +ARG BUN_PACKAGES_DIR=${BUN_DIR}/packages FROM --platform=linux/${BUILDARCH} ubuntu:22.04 as bun.devcontainer @@ -17,13 +18,14 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR +ARG BUN_PACKAGES_DIR ENV WEBKIT_OUT_DIR ${WEBKIT_DIR} ENV PATH "$ZIG_PATH:$PATH" ENV JSC_BASE_DIR $WEBKIT_OUT_DIR ENV LIB_ICU_PATH ${WEBKIT_OUT_DIR}/lib ENV BUN_RELEASE_DIR ${BUN_RELEASE_DIR} -ENV PATH "${GITHUB_WORKSPACE}/packages/bun-linux-x64:${GITHUB_WORKSPACE}/packages/bun-linux-aarch64:${GITHUB_WORKSPACE}/packages/debug-bun-linux-x64:${GITHUB_WORKSPACE}/packages/debug-bun-linux-aarch64:$PATH" +ENV PATH "${BUN_PACKAGES_DIR}/bun-linux-x64:${BUN_PACKAGES_DIR}/bun-linux-aarch64:${BUN_PACKAGES_DIR}/debug-bun-linux-x64:${BUN_PACKAGES_DIR}/debug-bun-linux-aarch64:$PATH" ENV PATH "/home/ubuntu/zls/zig-out/bin:$PATH" ENV BUN_INSTALL /home/ubuntu/.bun ENV XDG_CONFIG_HOME /home/ubuntu/.config @@ -112,4 +114,4 @@ RUN mkdir -p /home/ubuntu/.bun /home/ubuntu/.config $GITHUB_WORKSPACE/bun && \ bash /scripts/github.sh && \ bash /scripts/nice.sh && \ bash /scripts/zig-env.sh -COPY .devcontainer/zls.json /home/ubuntu/.config/zls.json
\ No newline at end of file +COPY .devcontainer/zls.json /home/ubuntu/.config/zls.json |