Add clone-submodules to devcontainer makefile

3 files changed, 10 insertions, 11 deletions

diff --git a/.devcontainer/scripts/getting-started.sh b/.devcontainer/scripts/getting-started.sh
index 5fa8af83c..ee66dd91f 100644
--- a/.devcontainer/scripts/getting-started.sh
+++ b/.devcontainer/scripts/getting-started.sh
@@ -6,9 +6,6 @@ echo "# First time setup"
 echo "gh auth login"
 echo "gh repo clone Jarred-Sumner/bun . -- --depth=1 --progress -j8"
 echo ""
-echo "# update all submodules except webkit because webkit takes awhile and it's already compiled for you."
-echo "git -c submodule.\"src/javascript/jsc/WebKit\".update=none submodule update --init --recursive --depth=1 --progress"
-echo ""
 echo "# Compile bun dependencies (zig is already compiled)"
 echo "make devcontainer"
 echo ""
diff --git a/Dockerfile b/Dockerfile
index c438079e9..122d84e1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -225,13 +225,12 @@ ARG BUN_RELEASE_DIR=${GITHUB_WORKSPACE}/bun-release
 ARG BUN_DEPS_OUT_DIR=${GITHUB_WORKSPACE}/bun-deps
 ARG BUN_DIR=${GITHUB_WORKSPACE}/bun
 
-
 ENV WEBKIT_OUT_DIR ${WEBKIT_DIR}
 ENV PATH "$ZIG_PATH:$PATH"
 ENV JSC_BASE_DIR $WEBKIT_OUT_DIR
-ENV LIB_ICU_PATH /home/ubuntu/icu/source/lib
+ENV LIB_ICU_PATH ${GITHUB_WORKSPACE}}/icu/source/lib
 ENV BUN_RELEASE_DIR ${BUN_RELEASE_DIR}
-ENV PATH "/workspaces/bun/packages/bun-linux-x64:/workspaces/bun/packages/bun-linux-aarch64:/workspaces/bun/packages/debug-bun-linux-x64:/workspaces/bun/packages/debug-bun-linux-aarch64:$PATH"
+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 "/home/ubuntu/zls/zig-out/bin:$PATH"
 
 ENV BUN_INSTALL /home/ubuntu/.bun
@@ -239,12 +238,12 @@ ENV XDG_CONFIG_HOME /home/ubuntu/.config
 
 RUN update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-12 90
 
-COPY .devcontainer/workspace.code-workspace /workspaces/workspace.code-workspace
-COPY .devcontainer/zls.json /workspaces/workspace.code-workspace
+COPY .devcontainer/workspace.code-workspace $GITHUB_WORKSPACE/workspace.code-workspace
+COPY .devcontainer/zls.json $GITHUB_WORKSPACE/workspace.code-workspace
 COPY .devcontainer/limits.conf /etc/security/limits.conf
 COPY ".devcontainer/scripts/" /scripts/
-COPY ".devcontainer/scripts/getting-started.sh" /workspaces/getting-started.sh
-RUN mkdir -p /home/ubuntu/.bun /home/ubuntu/.config /workspaces/bun && \
+COPY ".devcontainer/scripts/getting-started.sh" $GITHUB_WORKSPACE/getting-started.sh
+RUN mkdir -p /home/ubuntu/.bun /home/ubuntu/.config $GITHUB_WORKSPACE/bun && \
     bash /scripts/common-debian.sh && \
     bash /scripts/github.sh && \
     bash /scripts/nice.sh && \
diff --git a/Makefile b/Makefile
index 6e54cfee7..15b9741a3 100644
--- a/Makefile
+++ b/Makefile
@@ -414,7 +414,10 @@ jsc: jsc-build jsc-copy-headers jsc-bindings
 jsc-build: $(JSC_BUILD_STEPS)
 jsc-bindings: jsc-bindings-headers jsc-bindings-mac
 
-devcontainer: mimalloc zlib libarchive boringssl picohttp identifier-cache node-fallbacks jsc-bindings-headers api analytics bun_error fallback_decoder jsc-bindings-mac dev runtime_js_dev
+clone-submodules:
+	git -c submodule."src/javascript/jsc/WebKit".update=none submodule update --init --recursive --depth=1 --progress
+
+devcontainer: clone-submodules mimalloc zlib libarchive boringssl picohttp identifier-cache node-fallbacks jsc-bindings-headers api analytics bun_error fallback_decoder jsc-bindings-mac dev runtime_js_dev
 
 jsc-bindings-headers:
 	rm -f /tmp/build-jsc-headers src/javascript/jsc/bindings/headers.zig