[code] Update code to 1.60.0 and fix build

gitpod-io · Sep 14, 2021 · cfb528c · cfb528c
1 parent a45506d
commit cfb528c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 23 deletions.
diff --git a/components/ide/code/bin/code b/components/ide/code/bin/code
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-/ide/node/bin/gitpod-node /ide/out/gitpod-cli.js "$@"
+/ide/node /ide/out/gitpod-cli.js "$@"
diff --git a/components/ide/code/bin/gitpod-code b/components/ide/code/bin/gitpod-code
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-/ide/node/bin/gitpod-node /ide/out/gitpod-cli.js "$@"
+/ide/node /ide/out/gitpod-cli.js "$@"
diff --git a/components/ide/code/bin/open b/components/ide/code/bin/open
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-/ide/node/bin/gitpod-node /ide/out/gitpod-cli.js "$@"
+/ide/node /ide/out/gitpod-cli.js "$@"
diff --git a/components/ide/code/leeway.Dockerfile b/components/ide/code/leeway.Dockerfile
@@ -6,22 +6,6 @@
 # ideallay we should use exact version, but it has criticla bugs in regards to grpc over http2 streams
 ARG NODE_VERSION=14.17.4
 
-
-FROM node:${NODE_VERSION} AS node_installer
-RUN mkdir -p /ide/node/bin \
-    /ide/node/include/node/ \
-    /ide/node/lib/node_modules/npm/ \
-    /ide/node/lib/ && \
-    cp -a  /usr/local/bin/node              /ide/node/bin/ && \
-    cp -a  /usr/local/bin/npm               /ide/node/bin/ && \
-    cp -a  /usr/local/bin/npx               /ide/node/bin/ && \
-    cp -ar /usr/local/include/node/         /ide/node/include/ && \
-    cp -ar /usr/local/lib/node_modules/npm/ /ide/node/lib/node_modules/
-
-# rename node executable
-RUN cp /ide/node/bin/node /ide/node/bin/gitpod-node && rm /ide/node/bin/node
-
-
 FROM ubuntu:18.04 as code_installer
 
 RUN apt-get update \
@@ -42,7 +26,7 @@ RUN curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh |
     && npm install -g yarn node-gyp
 ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
 
-ENV GP_CODE_COMMIT 26bf7356a65baf730233257f41d77ebbf7e977f3
+ENV GP_CODE_COMMIT 332c5fa4288eddcb44f999fa5a7661e5d87f6d74
 RUN mkdir gp-code \
     && cd gp-code \
     && git init \
@@ -66,7 +50,6 @@ FROM scratch
 # copy static web resources in first layer to serve from blobserve
 COPY --from=code_installer --chown=33333:33333 /gitpod-pkg-web/ /ide/
 COPY --from=code_installer --chown=33333:33333 /gitpod-pkg-server/ /ide/
-COPY --from=node_installer --chown=33333:33333 /ide/node /ide/node
 COPY --chown=33333:33333 startup.sh supervisor-ide-config.json /ide/
 
 # cli config

diff --git a/components/ide/code/startup.sh b/components/ide/code/startup.sh
@@ -37,7 +37,7 @@ grep -rl open-vsx.org /ide | xargs sed -i "s|https://open-vsx.org|$VSX_REGISTRY_
 
 cd /ide || exit
 if [ "$SUPERVISOR_DEBUG_ENABLE" = "true" ]; then
-    exec /ide/node/bin/gitpod-node --inspect ./out/gitpod.js "$@" --verbose --log=trace
+    exec /ide/node --inspect ./out/gitpod.js "$@" --verbose --log=trace
 else
-    exec /ide/node/bin/gitpod-node ./out/gitpod.js "$@"
+    exec /ide/node ./out/gitpod.js "$@"
 fi