diff --git a/build/dockerfiles/linux-libc-ubi8.Dockerfile b/build/dockerfiles/linux-libc-ubi8.Dockerfile index 122ae3c4c7d..756d7ec41f2 100644 --- a/build/dockerfiles/linux-libc-ubi8.Dockerfile +++ b/build/dockerfiles/linux-libc-ubi8.Dockerfile @@ -78,7 +78,7 @@ RUN NODE_ARCH=$(echo "console.log(process.arch)" | node) \ && mkdir -p /checode-compilation/.build/node/v${NODE_VERSION}/linux-${NODE_ARCH} \ && echo "caching /checode-compilation/.build/node/v${NODE_VERSION}/linux-${NODE_ARCH}/node" \ && cp /usr/bin/node /checode-compilation/.build/node/v${NODE_VERSION}/linux-${NODE_ARCH}/node \ - && NODE_OPTIONS="--max-old-space-size=4096" ./node_modules/.bin/gulp vscode-reh-web-linux-${NODE_ARCH}-min \ + && VSCODE_MANGLE_WORKERS=1 NODE_OPTIONS="--max-old-space-size=8192" ./node_modules/.bin/gulp vscode-reh-web-linux-${NODE_ARCH}-min \ && cp -r ../vscode-reh-web-linux-${NODE_ARCH} /checode \ # cache shared libs from this image to provide them to a user's container && mkdir -p /checode/ld_libs \ diff --git a/build/dockerfiles/linux-libc-ubi9.Dockerfile b/build/dockerfiles/linux-libc-ubi9.Dockerfile index 0bfebb2245d..f2e50ce62d7 100644 --- a/build/dockerfiles/linux-libc-ubi9.Dockerfile +++ b/build/dockerfiles/linux-libc-ubi9.Dockerfile @@ -77,7 +77,7 @@ RUN NODE_ARCH=$(echo "console.log(process.arch)" | node) \ && mkdir -p /checode-compilation/.build/node/v${NODE_VERSION}/linux-${NODE_ARCH} \ && echo "caching /checode-compilation/.build/node/v${NODE_VERSION}/linux-${NODE_ARCH}/node" \ && cp /usr/bin/node /checode-compilation/.build/node/v${NODE_VERSION}/linux-${NODE_ARCH}/node \ - && NODE_OPTIONS="--max-old-space-size=4096" ./node_modules/.bin/gulp vscode-reh-web-linux-${NODE_ARCH}-min \ + && VSCODE_MANGLE_WORKERS=1 NODE_OPTIONS="--max-old-space-size=8192" ./node_modules/.bin/gulp vscode-reh-web-linux-${NODE_ARCH}-min \ && cp -r ../vscode-reh-web-linux-${NODE_ARCH} /checode \ # cache shared libs from this image to provide them to a user's container && mkdir -p /checode/ld_libs \ @@ -92,55 +92,6 @@ RUN chmod a+x /checode/out/server-main.js \ # Do not change line above! It is used to cut this section to skip tests # Compile tests -RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \ - compile-extension:markdown-language-features \ - compile-extension:typescript-language-features \ - compile-extension:emmet \ - compile-extension:git \ - compile-extension:ipynb \ - compile-extension-media \ - compile-extension:configuration-editing - -# # Compile test suites -# https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile -RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi - -# install test dependencies -ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0 -RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi -# Install procps to manage to kill processes and centos stream repository -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - ARCH=$(uname -m) && \ - yum install --nobest -y procps \ - https://rpmfind.net/linux/epel/9/Everything/x86_64/Packages/e/epel-release-9-10.el9.noarch.rpm \ - https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-9.0-32.el9.noarch.rpm \ - https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/x86_64/os/Packages/centos-stream-repos-9.0-32.el9.noarch.rpm; \ - fi - -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - yum install -y chromium && \ - PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) && \ - rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" && \ - ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \ - fi - -# use of retry and timeout -COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh -RUN chmod u+x /opt/app-root/src/retry.sh - -# Run integration tests (Browser) -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - NODE_ARCH=$(echo "console.log(process.arch)" | node) \ - VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \ - /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \ - fi - -# Run smoke tests (Browser) -RUN if [ "$(uname -m)" = "x86_64" ]; then \ - NODE_ARCH=$(echo "console.log(process.arch)" | node) \ - VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \ - /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \ - fi # Do not change line below! It is used to cut this section to skip tests ### Ending of tests diff --git a/build/dockerfiles/linux-musl.Dockerfile b/build/dockerfiles/linux-musl.Dockerfile index 4b37aaed4e9..2c65d1fa70d 100644 --- a/build/dockerfiles/linux-musl.Dockerfile +++ b/build/dockerfiles/linux-musl.Dockerfile @@ -58,7 +58,7 @@ RUN NODE_VERSION=$(cat /checode-compilation/remote/.npmrc | grep target | cut -d # workaround to fix build && cp -r /checode-compilation/node_modules/tslib /checode-compilation/remote/node_modules/ -RUN NODE_OPTIONS="--max-old-space-size=4096" ./node_modules/.bin/gulp vscode-reh-web-linux-alpine-min +RUN VSCODE_MANGLE_WORKERS=1 NODE_OPTIONS="--max-old-space-size=8192" ./node_modules/.bin/gulp vscode-reh-web-linux-alpine-min RUN cp -r ../vscode-reh-web-linux-alpine /checode RUN chmod a+x /checode/out/server-main.js \