Skip to content

Upgrade Dev Env with Leeway 0.10.2 #20780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2025
Merged

Upgrade Dev Env with Leeway 0.10.2 #20780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57a1147
Update dev env image with Leeway 10.0.2
corneliusludmann Apr 28, 2025
f93059b
Fix supervisor openssh build with new Leeway version
corneliusludmann Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/delete-preview/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
2 changes: 1 addition & 1 deletion .github/actions/deploy-gitpod/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
2 changes: 1 addition & 1 deletion .github/actions/deploy-monitoring-satellite/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
2 changes: 1 addition & 1 deletion .github/actions/preview-create/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357

COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
steps:
- uses: actions/checkout@v4
- name: Setup Environment
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
ports:
- 6379:6379
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
env:
DB_HOST: "mysql"
DB_PORT: "23306"
Expand Down Expand Up @@ -318,7 +318,7 @@ jobs:
- create-runner
runs-on: ${{ needs.create-runner.outputs.label }}
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
steps:
- uses: actions/checkout@v4
- name: Setup Environment
Expand Down Expand Up @@ -458,7 +458,7 @@ jobs:
- create-runner
runs-on: ${{ needs.create-runner.outputs.label }}
container:
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
if: needs.configuration.outputs.with_integration_tests != ''
concurrency:
group: ${{ needs.configuration.outputs.preview_name }}-integration-test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-environment
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ide-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
outputs:
name: ${{ steps.configuration.outputs.name }}
version: ${{ steps.configuration.outputs.version }}
Expand Down Expand Up @@ -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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
volumes:
- /var/tmp:/var/tmp
- /tmp:/tmp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jetbrains-auto-update-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
needs: [ create-runner ]
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jetbrains-integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
runs-on: ${{ needs.create-runner.outputs.label }}
needs: [create-runner]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview-env-check-regressions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
volumes:
- /var/tmp:/var/tmp
- /tmp:/tmp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview-env-gc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
outputs:
names: ${{ steps.set-matrix.outputs.names }}
count: ${{ steps.set-matrix.outputs.count }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/workspace-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
outputs:
name: ${{ steps.configuration.outputs.name }}
version: ${{ steps.configuration.outputs.version }}
Expand Down Expand Up @@ -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.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
steps:
- uses: actions/checkout@v4
- name: Integration Test
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.30393
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:main-gha.32357
workspaceLocation: gitpod/gitpod-ws.code-workspace
checkoutLocation: gitpod
ports:
Expand Down
2 changes: 1 addition & 1 deletion components/supervisor/BUILD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ packages:
deps:
- :app
- components/supervisor/frontend:app
- components/supervisor/openssh:app
- components/supervisor/openssh:docker-build
- components/gitpod-cli:app
argdeps:
- imageRepoBase
Expand Down
6 changes: 3 additions & 3 deletions components/supervisor/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ COPY components-supervisor--app/supervisor \
./

WORKDIR "/.supervisor/ssh"
COPY components-supervisor-openssh--app/usr/sbin/sshd .
COPY components-supervisor-openssh--app/usr/bin/ssh-keygen .
COPY components-supervisor-openssh--app/usr/libexec/sshd-session .
COPY components-supervisor-openssh--docker-build/content/content/usr/sbin/sshd .
COPY components-supervisor-openssh--docker-build/content/content/usr/bin/ssh-keygen .
COPY components-supervisor-openssh--docker-build/content/content/usr/libexec/sshd-session .

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

Expand Down
8 changes: 0 additions & 8 deletions components/supervisor/openssh/BUILD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
packages:
- name: app
type: generic
deps:
- :docker-build
config:
commands:
- ["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
config:
Expand Down
Loading