[VS Code Browser] Build stable code 1.94.1 (#20282)

* [VS Code Browser] Build stable code `1.94.1`

* Update code dockerfile

---------

Co-authored-by: Huiwen <[email protected]>

Author: roboquat

WORKSPACE.yaml

@@ -7,8 +7,8 @@ defaultArgs:
   publishToNPM: true
   publishToJBMarketplace: true
   localAppVersion: unknown
-  codeCommit: dbe6cce70f2466a5f716a17d4fccdf198ca6287f
-  codeVersion: 1.93.1
+  codeCommit: cac02285a3fef09965c46fb813c953b4fd0e13eb
+  codeVersion: 1.94.1
   codeQuality: stable
   codeWebExtensionCommit: 7ff72a2938a7a06cbdf3964590f7e9b7525958f3
   xtermCommit: 8f10c5febf0162a3c2309076302f770fbad38fde

components/ide/code/BUILD.yaml

@@ -25,7 +25,7 @@ packages:
       - codeQuality
       - codeVersion
     config:
-      dockerfile: leeway.nightly.Dockerfile
+      dockerfile: leeway.Dockerfile
       metadata:
         helm-component: workspace.codeImage
       buildArgs:

components/ide/code/leeway.Dockerfile

@@ -1,31 +1,14 @@
 # Copyright (c) 2020 Gitpod GmbH. All rights reserved.
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.
-FROM gitpod/openvscode-server-linux-build-agent:centos7-devtoolset8-x64 as dependencies_builder
+FROM gitpod/openvscode-server-linux-build-agent:focal-x64 as code_builder
 
 ENV TRIGGER_REBUILD 1
 
-ARG CODE_COMMIT
-
-RUN mkdir /gp-code \
-    && cd /gp-code \
-    && git init \
-    && git remote add origin https://github.com/gitpod-io/openvscode-server \
-    && git fetch origin $CODE_COMMIT --depth=1 \
-    && git reset --hard FETCH_HEAD
-WORKDIR /gp-code
-
-# Disable v8 cache used by yarn v1.x, refs https://github.com/nodejs/node/issues/51555
-ENV DISABLE_V8_COMPILE_CACHE=1
-
-RUN yarn --cwd remote --frozen-lockfile --network-timeout 180000
-
-FROM gitpod/openvscode-server-linux-build-agent:focal-x64 as code_builder
-
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 ENV ELECTRON_SKIP_BINARY_DOWNLOAD=1
 ENV VSCODE_ARCH=x64
-ENV NPM_REGISTRY=https://registry.yarnpkg.com
+ENV NPM_REGISTRY=https://registry.npmjs.org
 
 ARG CODE_COMMIT
 ARG CODE_QUALITY
@@ -61,15 +44,10 @@ RUN apt-get install -y pkg-config dbus xvfb libgtk-3-0 libxkbfile-dev libkrb5-de
 # Disable v8 cache used by yarn v1.x, refs https://github.com/nodejs/node/issues/51555
 ENV DISABLE_V8_COMPILE_CACHE=1
 
-ENV npm_config_arch=x64
+# ENV npm_config_arch=x64
 RUN mkdir -p .build \
-    && yarn config set registry "$NPM_REGISTRY" \
-    && yarn --cwd build --frozen-lockfile --check-files --network-timeout 180000 \
-    && yarn --frozen-lockfile --check-files --network-timeout 180000
-
-# copy remote dependencies build in dependencies_builder image
-RUN rm -rf remote/node_modules/
-COPY --from=dependencies_builder /gp-code/remote/node_modules/ /gp-code/remote/node_modules/
+    && npm config set registry "$NPM_REGISTRY" \
+    && npm ci
 
 # check that the provided codeVersion is the correct one for the given codeCommit
 RUN commitVersion=$(cat package.json | jq -r .version) \
@@ -91,23 +69,23 @@ RUN nameShort=$(jq --raw-output '.nameShort' product.json) && \
     mv product.json.tmp product.json && \
     jq '{quality,nameLong,nameShort}' product.json
 
-RUN yarn gulp compile-build \
-    && yarn gulp extensions-ci \
-    && yarn gulp minify-vscode-reh \
-    && yarn gulp vscode-web-min-ci \
-    && yarn gulp vscode-reh-linux-x64-min-ci
+RUN npm run gulp compile-build \
+    && npm run gulp extensions-ci \
+    && npm run gulp minify-vscode-reh \
+    && npm run gulp vscode-web-min-ci \
+    && npm run gulp vscode-reh-linux-x64-min-ci
 
 # config for first layer needed by blobserve
 # this custom urls will be then replaced by blobserve.
 # Check pkg/blobserve/blobserve.go, `inlineVars` method
-RUN cp /vscode-web/out/vs/gitpod/browser/workbench/workbench.html /vscode-web/index.html \
-    && cp /vscode-web/out/vs/gitpod/browser/workbench/callback.html /vscode-web/callback.html \
-    && sed -i -e "s/{{VERSION}}/$CODE_QUALITY-$CODE_COMMIT/g" /vscode-web/index.html
+RUN cp /vscode-web/out/vs/gitpod/browser/workbench/workbench.esm.html /vscode-web/index.html \
+&& cp /vscode-web/out/vs/gitpod/browser/workbench/callback.html /vscode-web/callback.html \
+&& sed -i -e "s/{{VERSION}}/$CODE_QUALITY-$CODE_COMMIT/g" /vscode-web/index.html
 
 # cli config: alises to gitpod-code
 RUN cp /vscode-reh-linux-x64/bin/remote-cli/gitpod-code /vscode-reh-linux-x64/bin/remote-cli/code \
-    && cp /vscode-reh-linux-x64/bin/remote-cli/gitpod-code /vscode-reh-linux-x64/bin/remote-cli/gp-code \
-    && cp /vscode-reh-linux-x64/bin/remote-cli/gitpod-code /vscode-reh-linux-x64/bin/remote-cli/open
+&& cp /vscode-reh-linux-x64/bin/remote-cli/gitpod-code /vscode-reh-linux-x64/bin/remote-cli/gp-code \
+&& cp /vscode-reh-linux-x64/bin/remote-cli/gitpod-code /vscode-reh-linux-x64/bin/remote-cli/open
 
 # grant write permissions for built-in extensions
 RUN chmod -R ugo+w /vscode-reh-linux-x64/extensions