From 78474ecc4f8487788094b2e802b217ed25e92f50 Mon Sep 17 00:00:00 2001 From: Gero Posmyk-Leinemann Date: Mon, 26 May 2025 09:13:08 +0000 Subject: [PATCH 1/3] [node] Bump docker builder images 18.20.7 -> 22.15.1 --- components/gitpod-db/leeway.Dockerfile | 6 +++--- components/ide/code/gitpod-web-extension/leeway.Dockerfile | 2 +- components/server/leeway.Dockerfile | 4 ++-- components/ws-manager-bridge/leeway.Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/gitpod-db/leeway.Dockerfile b/components/gitpod-db/leeway.Dockerfile index 66b4b081883a04..d605d4dc4f1644 100644 --- a/components/gitpod-db/leeway.Dockerfile +++ b/components/gitpod-db/leeway.Dockerfile @@ -2,7 +2,7 @@ # Licensed under the GNU Affero General Public License (AGPL). # See License.AGPL.txt in the project root for license information. -FROM node:18.20.7-alpine AS builder +FROM node:22.15.1-alpine AS builder # Install bash RUN apk update && \ @@ -13,11 +13,11 @@ COPY components-gitpod-db--migrations /installer/ WORKDIR /app RUN /installer/install.sh -FROM node:18.20.7-alpine as proxy +FROM node:22.15.1-alpine as proxy RUN wget https://storage.googleapis.com/cloudsql-proxy/v1.37.6/cloud_sql_proxy.linux.amd64 -O /bin/cloud_sql_proxy \ && chmod +x /bin/cloud_sql_proxy -FROM node:18.20.7-alpine +FROM node:22.15.1-alpine # Install bash RUN apk update && \ diff --git a/components/ide/code/gitpod-web-extension/leeway.Dockerfile b/components/ide/code/gitpod-web-extension/leeway.Dockerfile index 66f814fc81eb50..8b18f23e272b7a 100644 --- a/components/ide/code/gitpod-web-extension/leeway.Dockerfile +++ b/components/ide/code/gitpod-web-extension/leeway.Dockerfile @@ -1,7 +1,7 @@ # 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 node:18 as builder +FROM node:22.15.1 as builder ARG CODE_EXTENSION_COMMIT diff --git a/components/server/leeway.Dockerfile b/components/server/leeway.Dockerfile index 82c684b49e228a..797b01cac81346 100644 --- a/components/server/leeway.Dockerfile +++ b/components/server/leeway.Dockerfile @@ -2,7 +2,7 @@ # Licensed under the GNU Affero General Public License (AGPL). # See License.AGPL.txt in the project root for license information. -FROM node:18.20.7-alpine AS builder +FROM node:22.15.1-alpine AS builder # Install Python, make, gcc and g++ for node-gyp RUN apk update && \ @@ -14,7 +14,7 @@ COPY components-server--app /installer/ WORKDIR /app RUN /installer/install.sh -FROM node:18.20.7-alpine +FROM node:22.15.1-alpine ENV NODE_OPTIONS="--unhandled-rejections=warn --max_old_space_size=2048" EXPOSE 3000 diff --git a/components/ws-manager-bridge/leeway.Dockerfile b/components/ws-manager-bridge/leeway.Dockerfile index 35f722cd8f9fd4..07ecf5552e1bc5 100644 --- a/components/ws-manager-bridge/leeway.Dockerfile +++ b/components/ws-manager-bridge/leeway.Dockerfile @@ -2,7 +2,7 @@ # Licensed under the GNU Affero General Public License (AGPL). # See License.AGPL.txt in the project root for license information. -FROM node:18.20.7-alpine AS builder +FROM node:22.15.1-alpine AS builder # Install bash for the installer script RUN apk update && \ @@ -14,7 +14,7 @@ COPY components-ws-manager-bridge--app /installer/ WORKDIR /app RUN /installer/install.sh -FROM node:18.20.7-alpine +FROM node:22.15.1-alpine ENV NODE_OPTIONS=--unhandled-rejections=warn EXPOSE 3000 COPY --from=builder --chown=node:node /app /app/ From 7cde6384c56747c17cb2e75ad65514e4499b610d Mon Sep 17 00:00:00 2001 From: Gero Posmyk-Leinemann Date: Tue, 27 May 2025 13:15:31 +0000 Subject: [PATCH 2/3] [dev] Bump dev image references (18.20.7 -> 22.15.1) --- .github/actions/delete-preview/Dockerfile | 2 +- .github/actions/deploy-gitpod/Dockerfile | 2 +- .github/actions/deploy-monitoring-satellite/Dockerfile | 2 +- .github/actions/preview-create/Dockerfile | 2 +- .github/workflows/build.yml | 6 +++--- .github/workflows/code-nightly.yml | 2 +- .github/workflows/ide-integration-tests.yml | 4 ++-- .github/workflows/jetbrains-auto-update-template.yml | 2 +- .github/workflows/jetbrains-integration-test.yml | 2 +- .github/workflows/preview-env-check-regressions.yml | 2 +- .github/workflows/preview-env-gc.yml | 2 +- .github/workflows/workspace-integration-tests.yml | 4 ++-- .gitpod.yml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/actions/delete-preview/Dockerfile b/.github/actions/delete-preview/Dockerfile index 8a1dd13521aadc..bcc936a91932a7 100644 --- a/.github/actions/delete-preview/Dockerfile +++ b/.github/actions/delete-preview/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/deploy-gitpod/Dockerfile b/.github/actions/deploy-gitpod/Dockerfile index 8a1dd13521aadc..bcc936a91932a7 100644 --- a/.github/actions/deploy-gitpod/Dockerfile +++ b/.github/actions/deploy-gitpod/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/deploy-monitoring-satellite/Dockerfile b/.github/actions/deploy-monitoring-satellite/Dockerfile index 8a1dd13521aadc..bcc936a91932a7 100644 --- a/.github/actions/deploy-monitoring-satellite/Dockerfile +++ b/.github/actions/deploy-monitoring-satellite/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/preview-create/Dockerfile b/.github/actions/preview-create/Dockerfile index 8a1dd13521aadc..bcc936a91932a7 100644 --- a/.github/actions/preview-create/Dockerfile +++ b/.github/actions/preview-create/Dockerfile @@ -1,4 +1,4 @@ -FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f0d3bdce6ff53..08b534e881b1e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,7 +118,7 @@ jobs: cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }} runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 steps: - uses: actions/checkout@v4 - name: Setup Environment @@ -188,7 +188,7 @@ jobs: ports: - 6379:6379 container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 env: DB_HOST: "mysql" DB_PORT: "23306" @@ -521,7 +521,7 @@ jobs: - create-runner runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 if: needs.configuration.outputs.with_integration_tests != '' && needs.configuration.outputs.is_scheduled_run != 'true' concurrency: group: ${{ needs.configuration.outputs.preview_name }}-integration-test diff --git a/.github/workflows/code-nightly.yml b/.github/workflows/code-nightly.yml index 644080fec06dc8..c216b67fed20f1 100644 --- a/.github/workflows/code-nightly.yml +++ b/.github/workflows/code-nightly.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-environment diff --git a/.github/workflows/ide-integration-tests.yml b/.github/workflows/ide-integration-tests.yml index d9a83804613bd9..c7da63c097c3e8 100644 --- a/.github/workflows/ide-integration-tests.yml +++ b/.github/workflows/ide-integration-tests.yml @@ -43,7 +43,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 outputs: name: ${{ steps.configuration.outputs.name }} version: ${{ steps.configuration.outputs.version }} @@ -131,7 +131,7 @@ jobs: needs: [configuration, infrastructure, create-runner] runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 volumes: - /var/tmp:/var/tmp - /tmp:/tmp diff --git a/.github/workflows/jetbrains-auto-update-template.yml b/.github/workflows/jetbrains-auto-update-template.yml index 945a479af9839c..924d28f1b6244b 100644 --- a/.github/workflows/jetbrains-auto-update-template.yml +++ b/.github/workflows/jetbrains-auto-update-template.yml @@ -23,7 +23,7 @@ jobs: update-jetbrains: runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 needs: [ create-runner ] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/jetbrains-integration-test.yml b/.github/workflows/jetbrains-integration-test.yml index fac228c97d4ee3..bc348bb5abab64 100644 --- a/.github/workflows/jetbrains-integration-test.yml +++ b/.github/workflows/jetbrains-integration-test.yml @@ -39,7 +39,7 @@ jobs: gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }} jetbrains-smoke-test-linux: container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] steps: diff --git a/.github/workflows/preview-env-check-regressions.yml b/.github/workflows/preview-env-check-regressions.yml index 57e7f64f4be458..e83d6e17eb524a 100644 --- a/.github/workflows/preview-env-check-regressions.yml +++ b/.github/workflows/preview-env-check-regressions.yml @@ -99,7 +99,7 @@ jobs: if: ${{ needs.configuration.outputs.skip == 'false' }} runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 volumes: - /var/tmp:/var/tmp - /tmp:/tmp diff --git a/.github/workflows/preview-env-gc.yml b/.github/workflows/preview-env-gc.yml index 4c4c7459270400..e85da5936ae1ac 100644 --- a/.github/workflows/preview-env-gc.yml +++ b/.github/workflows/preview-env-gc.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 outputs: names: ${{ steps.set-matrix.outputs.names }} count: ${{ steps.set-matrix.outputs.count }} diff --git a/.github/workflows/workspace-integration-tests.yml b/.github/workflows/workspace-integration-tests.yml index be509588cbaef6..2b895aa5f097f7 100644 --- a/.github/workflows/workspace-integration-tests.yml +++ b/.github/workflows/workspace-integration-tests.yml @@ -61,7 +61,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 outputs: name: ${{ steps.configuration.outputs.name }} version: ${{ steps.configuration.outputs.version }} @@ -166,7 +166,7 @@ jobs: needs: [configuration, infrastructure, create-runner] runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 steps: - uses: actions/checkout@v4 - name: Integration Test diff --git a/.gitpod.yml b/.gitpod.yml index 4125c8d03181aa..9af9225ce0fdbc 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32507 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32852 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: From b1a8a073ed57db74ca608b839fdd831c153ba85c Mon Sep 17 00:00:00 2001 From: Gero Posmyk-Leinemann Date: Tue, 27 May 2025 14:44:59 +0000 Subject: [PATCH 3/3] [dev] Bump devcontainer nodejs to 22.15.1 --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2cc7b3bd6e5ea7..4da52b8af34d49 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -311,7 +311,7 @@ RUN curl -fsSL "https://get.sdkman.io" | bash \ # above, we are adding the sdkman init to .bashrc (executing sdkman-init.sh does that), because one is executed on interactive shells, the other for non-interactive shells (e.g. plugin-host) ENV GRADLE_USER_HOME=/workspace/.gradle/ -ENV NODE_VERSION=18.20.4 +ENV NODE_VERSION=22.15.1 ENV PNPM_HOME=/root/.pnpm ENV PATH=/root/.nvm/versions/node/v${NODE_VERSION}/bin:/root/.yarn/bin:${PNPM_HOME}:$PATH