Skip to content

e2e: use docker v29.x dind as default #6793

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
thaJeztah merged 1 commit into from
Feb 11, 2026
+2 −5
Merged

e2e: use docker v29.x dind as default #6793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 e2e/compose-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
image: 'registry:3'

engine:
image: 'docker:${ENGINE_VERSION:-28}-dind'
image: 'docker:${ENGINE_VERSION:-29}-dind'
privileged: true
command: ['--insecure-registry=registry:5000', '--experimental']
environment:
Expand Down
5 changes: 1 addition & 4 deletions e2e/testdata/Dockerfile.connhelper-ssh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@

# ENGINE_VERSION is the version of the (docker-in-docker) Docker Engine to
# test against.
ARG ENGINE_VERSION=28
ARG ENGINE_VERSION=29

FROM docker:${ENGINE_VERSION}-dind

# the openssh-client update is needed for security reasons when using docker:23.0-dind, currently maintained as an lts by mirantis
RUN apk --no-cache add openssl openssh-client openssh-server shadow && \
apk --no-cache upgrade openssl openssh-client openssh-server && \
Comment on lines 10 to 11
Copy link
Member Author

@thaJeztah thaJeztah Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if we still need the upgrade here; I can do a follow-up to remove it if it's no longer needed; I recall it was a workaround for a bug; b611f28

# TODO(krissetto): `groupadd` can be removed once we only test against moby >= v24
# see https://github.com/docker-library/docker/pull/470
groupadd -f docker && \
useradd --create-home --shell /bin/sh --password $(head -c32 /dev/urandom | base64) penguin && \
usermod -aG docker penguin && \
ssh-keygen -A
Expand Down
Loading