Skip to content

Commit 89f0bc5

Browse files
corneliusludmanncorneliusludmann
authored
Upgrade Dev Env with Leeway 0.10.2 (#20780)
* Update dev env image with Leeway 10.0.2 * Fix supervisor openssh build with new Leeway version
1 parent 189cafb commit 89f0bc5

16 files changed

+22
-30
lines changed

‎.github/actions/delete-preview/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
22

33
COPY entrypoint.sh /entrypoint.sh
44
ENTRYPOINT ["/entrypoint.sh"]

‎.github/actions/deploy-gitpod/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
22

33
COPY entrypoint.sh /entrypoint.sh
44
ENTRYPOINT ["/entrypoint.sh"]

‎.github/actions/deploy-monitoring-satellite/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
22

33
COPY entrypoint.sh /entrypoint.sh
44
ENTRYPOINT ["/entrypoint.sh"]

‎.github/actions/preview-create/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
22

33
COPY entrypoint.sh /entrypoint.sh
44
ENTRYPOINT ["/entrypoint.sh"]

‎.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
106106
runs-on: ${{ needs.create-runner.outputs.label }}
107107
container:
108-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
108+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
109109
steps:
110110
- uses: actions/checkout@v4
111111
- name: Setup Environment
@@ -172,7 +172,7 @@ jobs:
172172
ports:
173173
- 6379:6379
174174
container:
175-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
175+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
176176
env:
177177
DB_HOST: "mysql"
178178
DB_PORT: "23306"
@@ -318,7 +318,7 @@ jobs:
318318
- create-runner
319319
runs-on: ${{ needs.create-runner.outputs.label }}
320320
container:
321-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
321+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
322322
steps:
323323
- uses: actions/checkout@v4
324324
- name: Setup Environment
@@ -458,7 +458,7 @@ jobs:
458458
- create-runner
459459
runs-on: ${{ needs.create-runner.outputs.label }}
460460
container:
461-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
461+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
462462
if: needs.configuration.outputs.with_integration_tests != ''
463463
concurrency:
464464
group: ${{ needs.configuration.outputs.preview_name }}-integration-test

‎.github/workflows/code-nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ needs.create-runner.outputs.label }}
1919
needs: [create-runner]
2020
container:
21-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
21+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
2222
steps:
2323
- uses: actions/checkout@v4
2424
- uses: ./.github/actions/setup-environment

‎.github/workflows/ide-integration-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: ${{ needs.create-runner.outputs.label }}
4444
needs: [create-runner]
4545
container:
46-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
46+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
4747
outputs:
4848
name: ${{ steps.configuration.outputs.name }}
4949
version: ${{ steps.configuration.outputs.version }}
@@ -131,7 +131,7 @@ jobs:
131131
needs: [configuration, infrastructure, create-runner]
132132
runs-on: ${{ needs.create-runner.outputs.label }}
133133
container:
134-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
134+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
135135
volumes:
136136
- /var/tmp:/var/tmp
137137
- /tmp:/tmp

‎.github/workflows/jetbrains-auto-update-template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
update-jetbrains:
2424
runs-on: ${{ needs.create-runner.outputs.label }}
2525
container:
26-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
26+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
2727
needs: [ create-runner ]
2828
steps:
2929
- uses: actions/checkout@v2

‎.github/workflows/jetbrains-integration-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
gcp_credentials: ${{ secrets.SELF_HOSTED_GITHUB_RUNNER_GCP_CREDENTIALS }}
4040
jetbrains-smoke-test-linux:
4141
container:
42-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
42+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
4343
runs-on: ${{ needs.create-runner.outputs.label }}
4444
needs: [create-runner]
4545
steps:

‎.github/workflows/preview-env-check-regressions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
if: ${{ needs.configuration.outputs.skip == 'false' }}
100100
runs-on: ${{ needs.create-runner.outputs.label }}
101101
container:
102-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
102+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
103103
volumes:
104104
- /var/tmp:/var/tmp
105105
- /tmp:/tmp

‎.github/workflows/preview-env-gc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ needs.create-runner.outputs.label }}
1919
needs: [create-runner]
2020
container:
21-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
21+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
2222
outputs:
2323
names: ${{ steps.set-matrix.outputs.names }}
2424
count: ${{ steps.set-matrix.outputs.count }}

‎.github/workflows/workspace-integration-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
runs-on: ${{ needs.create-runner.outputs.label }}
6262
needs: [create-runner]
6363
container:
64-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
64+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
6565
outputs:
6666
name: ${{ steps.configuration.outputs.name }}
6767
version: ${{ steps.configuration.outputs.version }}
@@ -166,7 +166,7 @@ jobs:
166166
needs: [configuration, infrastructure, create-runner]
167167
runs-on: ${{ needs.create-runner.outputs.label }}
168168
container:
169-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
169+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
170170
steps:
171171
- uses: actions/checkout@v4
172172
- name: Integration Test

‎.gitpod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
1+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
22
workspaceLocation: gitpod/gitpod-ws.code-workspace
33
checkoutLocation: gitpod
44
ports:

‎components/supervisor/BUILD.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ packages:
2727
deps:
2828
- :app
2929
- components/supervisor/frontend:app
30-
- components/supervisor/openssh:app
30+
- components/supervisor/openssh:docker-build
3131
- components/gitpod-cli:app
3232
argdeps:
3333
- imageRepoBase

‎components/supervisor/leeway.Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ COPY components-supervisor--app/supervisor \
2828
./
2929

3030
WORKDIR "/.supervisor/ssh"
31-
COPY components-supervisor-openssh--app/usr/sbin/sshd .
32-
COPY components-supervisor-openssh--app/usr/bin/ssh-keygen .
33-
COPY components-supervisor-openssh--app/usr/libexec/sshd-session .
31+
COPY components-supervisor-openssh--docker-build/content/content/usr/sbin/sshd .
32+
COPY components-supervisor-openssh--docker-build/content/content/usr/bin/ssh-keygen .
33+
COPY components-supervisor-openssh--docker-build/content/content/usr/libexec/sshd-session .
3434

3535
COPY --from=docker_cli_builder /gp-docker/docker/docker /.supervisor/gitpod-docker-cli
3636

‎components/supervisor/openssh/BUILD.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
packages:
2-
- name: app
3-
type: generic
4-
deps:
5-
- :docker-build
6-
config:
7-
commands:
8-
- ["sh", "-c","TARFILE=$(cat ./components-supervisor-openssh--docker-build/manifest.json | jq -r '.[].Layers[]') && tar xvf ./components-supervisor-openssh--docker-build/$TARFILE"]
9-
- ["rm", "-rf", "components-supervisor-openssh--docker-build"]
102
- name: docker-build
113
type: docker
124
config:

0 commit comments

Comments
 (0)