Skip to content

dockerfile: use moby-bin and cli-bin images for docker binaries#2321

Merged
crazy-max merged 1 commit into
docker:masterfrom
crazy-max:docker-use-bin-images
Mar 7, 2024
Merged

dockerfile: use moby-bin and cli-bin images for docker binaries#2321
crazy-max merged 1 commit into
docker:masterfrom
crazy-max:docker-use-bin-images

Conversation

@crazy-max
Copy link
Copy Markdown
Member

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

picked from #2307

we can now use moby/moby-bin and dockereng/cli-bin images for testing docker in our integration tests.

Comment thread Dockerfile Outdated
Comment on lines +23 to +24
FROM moby/moby-bin:$DOCKER_VERSION AS docker-engine
FROM dockereng/cli-bin:$DOCKER_VERSION AS docker-cli
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do you think there's a need to call out that these are automated builds, not "official releases" (for the occasional reader)?

(We should also really fix those repositories to have a readme to outline their purpose / give the right expectations 😞 - let me see if someone can work on that)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Added "for testing" comment on args if that sgty.

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max crazy-max force-pushed the docker-use-bin-images branch from 37adb5a to 70a28fe Compare March 7, 2024 12:10
@crazy-max crazy-max requested a review from thaJeztah March 7, 2024 12:11
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, yes, that comment should do for now. I created an internal ticket to look at adding README's to those repositories.

Comment thread Dockerfile
Comment on lines 7 to 10
ARG DOCKER_VERSION=25.0.2
ARG GOTESTSUM_VERSION=v1.9.0
ARG REGISTRY_VERSION=2.8.0
ARG BUILDKIT_VERSION=v0.12.5
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks like we have some versions to update here (probably fine to be done separate)

Copy link
Copy Markdown
Member Author

@crazy-max crazy-max Mar 7, 2024

Choose a reason for hiding this comment

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

Yes done in #2322 for buildkit and will be for docker in #2307

@crazy-max crazy-max merged commit 4327ee7 into docker:master Mar 7, 2024
@crazy-max crazy-max deleted the docker-use-bin-images branch March 7, 2024 12:46
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.

2 participants