From b2d2a30d7a848b776dcc0cc64e68c524c8681bd2 Mon Sep 17 00:00:00 2001 From: Alejandro de Brito Fontes Date: Sun, 24 Mar 2024 20:19:28 +0000 Subject: [PATCH 1/4] Rebuild dev-image for go v1.22 --- dev/image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index bb01cdf7c1104f..6b2b2e1f8fb457 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -4,7 +4,7 @@ FROM gitpod/workspace-gitpod-dev:latest -ENV TRIGGER_REBUILD 40 +ENV TRIGGER_REBUILD 41 USER root From c3034808eba947192d21d930d162a30c33311af9 Mon Sep 17 00:00:00 2001 From: Alejandro de Brito Fontes Date: Sun, 24 Mar 2024 20:30:04 +0000 Subject: [PATCH 2/4] Update dev-image --- .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/lacework-inline-scanner.yml | 2 +- .github/workflows/preview-env-check-regressions.yml | 2 +- .github/workflows/preview-env-gc.yml | 2 +- .github/workflows/workspace-integration-tests.yml | 6 +++--- .gitpod.yml | 2 +- .../typescript-common/fixtures/toWorkspace2_2.json | 4 ++-- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/actions/delete-preview/Dockerfile b/.github/actions/delete-preview/Dockerfile index 667a525bb8d312..e261687cced6c3 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:at-user-getauthenticated-dashboard-gha.20954 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/deploy-gitpod/Dockerfile b/.github/actions/deploy-gitpod/Dockerfile index 667a525bb8d312..e261687cced6c3 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:at-user-getauthenticated-dashboard-gha.20954 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 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 667a525bb8d312..e261687cced6c3 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:at-user-getauthenticated-dashboard-gha.20954 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/preview-create/Dockerfile b/.github/actions/preview-create/Dockerfile index 667a525bb8d312..e261687cced6c3 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:at-user-getauthenticated-dashboard-gha.20954 +FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 300018c8daeb2e..40e9f1c715cce2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,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:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 outputs: previewctl_hash: ${{ steps.build.outputs.previewctl_hash }} steps: @@ -161,7 +161,7 @@ jobs: ports: - 6379:6379 container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 env: DB_HOST: "mysql" DB_PORT: "23306" @@ -401,7 +401,7 @@ jobs: - create-runner runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 if: needs.configuration.outputs.with_integration_tests != '' concurrency: group: ${{ needs.configuration.outputs.preview_name }}-integration-test diff --git a/.github/workflows/code-nightly.yml b/.github/workflows/code-nightly.yml index 2275503cad3cd4..05d9c0feeb710a 100644 --- a/.github/workflows/code-nightly.yml +++ b/.github/workflows/code-nightly.yml @@ -16,7 +16,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 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 795b109af34a75..9dd8db4766ecc2 100644 --- a/.github/workflows/ide-integration-tests.yml +++ b/.github/workflows/ide-integration-tests.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 outputs: name: ${{ steps.configuration.outputs.name }} version: ${{ steps.configuration.outputs.version }} @@ -101,7 +101,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:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 volumes: - /var/tmp:/var/tmp - /tmp:/tmp diff --git a/.github/workflows/lacework-inline-scanner.yml b/.github/workflows/lacework-inline-scanner.yml index cebb09894ff4eb..23aed05e23a116 100644 --- a/.github/workflows/lacework-inline-scanner.yml +++ b/.github/workflows/lacework-inline-scanner.yml @@ -51,7 +51,7 @@ jobs: needs: [configuration,create-runner] if: ${{ needs.configuration.outputs.skip == 'false' }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 steps: # Most of this is taken over from the Build workflow/preview-env-check-regressions workflow - uses: actions/checkout@v4 diff --git a/.github/workflows/preview-env-check-regressions.yml b/.github/workflows/preview-env-check-regressions.yml index 763c05d85e4129..4285048cb729b2 100644 --- a/.github/workflows/preview-env-check-regressions.yml +++ b/.github/workflows/preview-env-check-regressions.yml @@ -86,7 +86,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:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 volumes: - /var/tmp:/var/tmp - /tmp:/tmp diff --git a/.github/workflows/preview-env-gc.yml b/.github/workflows/preview-env-gc.yml index 046540597ae487..decef8f1182b4a 100644 --- a/.github/workflows/preview-env-gc.yml +++ b/.github/workflows/preview-env-gc.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 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 50a63663a770de..e6faa807a02313 100644 --- a/.github/workflows/workspace-integration-tests.yml +++ b/.github/workflows/workspace-integration-tests.yml @@ -45,7 +45,7 @@ jobs: runs-on: ${{ needs.create-runner.outputs.label }} needs: [create-runner] container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 outputs: name: ${{ steps.configuration.outputs.name }} version: ${{ steps.configuration.outputs.version }} @@ -136,7 +136,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:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 steps: - uses: actions/checkout@v4 - id: auth @@ -167,7 +167,7 @@ jobs: if: inputs.skip_delete != 'true' && always() runs-on: ${{ needs.create-runner.outputs.label }} container: - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 steps: - uses: actions/checkout@v4 - name: Delete preview environment diff --git a/.gitpod.yml b/.gitpod.yml index 19f35b24173c96..59fb4551a3026a 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: diff --git a/components/public-api/typescript-common/fixtures/toWorkspace2_2.json b/components/public-api/typescript-common/fixtures/toWorkspace2_2.json index 709fe88865d5bb..852a8ec596a6ce 100644 --- a/components/public-api/typescript-common/fixtures/toWorkspace2_2.json +++ b/components/public-api/typescript-common/fixtures/toWorkspace2_2.json @@ -30,7 +30,7 @@ }, "cloneUrl": "https://github.com/gitpod-io/gitpod.git", "config": { - "image": "eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954", + "image": "eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879", "workspaceLocation": "gitpod/gitpod-ws.code-workspace", "checkoutLocation": "gitpod", "ports": [ @@ -77,7 +77,7 @@ "ideCredentials": "ideCredentials" }, "imageSource": { - "baseImageResolved": "eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-user-getauthenticated-dashboard-gha.20954" + "baseImageResolved": "eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go-122-gha.23879" }, "imageNameResolved": "877922613839.dkr.ecr.eu-central-1.amazonaws.com/image-build/workspace-images:adb73357f7e48abcb1210a0fad039618a8156bb5de667a2ae7acb98ff5244b5e", "baseImageNameResolved": "eu.gcr.io/gitpod-core-dev/dev/dev-environment@sha256:1107ae38187802fd784467529d9cc0b98e720f0980e3ec2fcbcecb4d7916da5e", From 69f2ad21801090f6802b03e7a416407004ac4c2d Mon Sep 17 00:00:00 2001 From: Alejandro de Brito Fontes Date: Mon, 25 Mar 2024 06:50:18 +0000 Subject: [PATCH 3/4] Update openssh to 9.7p1 --- components/supervisor/openssh/leeway.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/supervisor/openssh/leeway.Dockerfile b/components/supervisor/openssh/leeway.Dockerfile index d3e4bad16ef35d..cf19eb370d3b81 100644 --- a/components/supervisor/openssh/leeway.Dockerfile +++ b/components/supervisor/openssh/leeway.Dockerfile @@ -22,7 +22,7 @@ # This Dockerfile was taken from https://github.com/ep76/docker-openssh-static and adapted. FROM alpine:3.19 AS builder -ARG openssh_url=https://github.com/openssh/openssh-portable/archive/refs/tags/V_9_6_P1.tar.gz +ARG openssh_url=https://github.com/openssh/openssh-portable/archive/refs/tags/V_9_7_P1.tar.gz WORKDIR /build From 9a9f9b7140823e953f33aae466175153a37db092 Mon Sep 17 00:00:00 2001 From: Alejandro de Brito Fontes Date: Mon, 25 Mar 2024 10:43:02 +0000 Subject: [PATCH 4/4] Refactor extraction of docker layer --- components/supervisor/openssh/BUILD.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/supervisor/openssh/BUILD.yaml b/components/supervisor/openssh/BUILD.yaml index 2a0945eee48267..2dfb3a9596c1a4 100644 --- a/components/supervisor/openssh/BUILD.yaml +++ b/components/supervisor/openssh/BUILD.yaml @@ -5,7 +5,7 @@ packages: - :docker-build config: commands: - - ["sh", "-c", "find . | grep layer.tar | while read f; do tar xfv $f; done"] + - ["sh", "-c","TARFILE=$(cat ./components-supervisor-openssh--docker-build/manifest.json | jq -r '.[].Layers[]') && tar xvf ./components-supervisor-openssh--docker-build/$TARFILE"] - ["rm", "-rf", "components-supervisor-openssh--docker-build"] - name: docker-build type: docker