Skip to content
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.

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

tests: handle multiple docker versions #2307

Merged
merged 1 commit into from
Nov 20, 2024

Conversation

crazy-max
Copy link
Member

@crazy-max crazy-max commented Mar 5, 2024

@crazy-max
Copy link
Member Author

@tonistiigi As discussed we could also handle builders through docker context with specific dind image as follow-up.

@crazy-max crazy-max marked this pull request as ready for review March 7, 2024 18:35
@davhdavh
Copy link

davhdavh commented Mar 8, 2024

These seem relevant to this pr:

buildx/tests/build.go

Lines 442 to 443 in 4327ee7

// TODO: use stable buildkit image when v0.13.0 released
out, err := createCmd(sb, withArgs("--driver", "docker-container", "--buildkitd-flags=--oci-worker-net=bridge --allow-insecure-entitlement=network.host", "--driver-opt", "image=moby/buildkit:v0.13.0-rc3"))

buildx/tests/build.go

Lines 576 to 577 in 4327ee7

// TODO: use stable buildkit image when v0.13.0 released
out, err := createCmd(sb, withArgs(

buildx/tests/build.go

Lines 643 to 644 in 4327ee7

// TODO: use stable buildkit image when v0.13.0 released
out, err := createCmd(sb, withArgs(

@crazy-max
Copy link
Member Author

These seem relevant to this pr:

buildx/tests/build.go

Lines 442 to 443 in 4327ee7

// TODO: use stable buildkit image when v0.13.0 released
out, err := createCmd(sb, withArgs("--driver", "docker-container", "--buildkitd-flags=--oci-worker-net=bridge --allow-insecure-entitlement=network.host", "--driver-opt", "image=moby/buildkit:v0.13.0-rc3"))

buildx/tests/build.go

Lines 576 to 577 in 4327ee7

// TODO: use stable buildkit image when v0.13.0 released
out, err := createCmd(sb, withArgs(

buildx/tests/build.go

Lines 643 to 644 in 4327ee7

// TODO: use stable buildkit image when v0.13.0 released
out, err := createCmd(sb, withArgs(

WDYM? This PR is about testing multiple dockerd versions. For BuildKit see #2322

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max crazy-max force-pushed the test-docker-multi-ver branch from b0f8fcc to a69d857 Compare November 19, 2024 23:59
@crazy-max crazy-max added this to the v0.20.0 milestone Nov 20, 2024
@crazy-max crazy-max marked this pull request as ready for review November 20, 2024 00:10
@@ -5,6 +5,7 @@ ARG XX_VERSION=1.5.0

# for testing
ARG DOCKER_VERSION=27.4.0-rc.2
ARG DOCKER_VERSION_ALT_26=26.1.3
Copy link
Member Author

@crazy-max crazy-max Nov 20, 2024

Choose a reason for hiding this comment

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

26.1.3 is the current version shipped on GitHub runners. I think it makes sense to test this alt version.

@tonistiigi tonistiigi merged commit 5937ba0 into docker:master Nov 20, 2024
116 checks passed
@crazy-max crazy-max deleted the test-docker-multi-ver branch November 20, 2024 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants