Skip to content

bump docker/docker and docker/cli v27.0.1-rc.1, compose-go v2.1.3#11926

Merged
glours merged 2 commits intodocker:mainfrom
thaJeztah:bump_docker_27
Jun 21, 2024
Merged

bump docker/docker and docker/cli v27.0.1-rc.1, compose-go v2.1.3#11926
glours merged 2 commits intodocker:mainfrom
thaJeztah:bump_docker_27

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jun 20, 2024 •
edited
Loading

rebased of / updated version of:

go.mod: github.com/compose-spec/compose-go v2.1.3

diff:

go.mod: docker/docker and docker/cli v27.0.1-rc.1

diffs:

What I did

Related issue

(not mandatory) A picture of a cute animal, if possible in relation to what you did

@thaJeztah thaJeztah force-pushed the bump_docker_27 branch 2 times, most recently from a939621 to e533fc8 Compare June 20, 2024 13:42
This was referenced Jun 20, 2024
Merged
Closed
@thaJeztah thaJeztah force-pushed the bump_docker_27 branch 3 times, most recently from 0659e7e to 9effe34 Compare June 20, 2024 21:28
@thaJeztah thaJeztah changed the title WIP bump docker, docker-cli to master (v27.0-dev) bump docker/docker and docker/cli v27.0.1-rc.1 Jun 20, 2024
@thaJeztah thaJeztah changed the title bump docker/docker and docker/cli v27.0.1-rc.1 bump docker/docker and docker/cli v27.0.1-rc.1, compose-go v2.1.3 Jun 20, 2024
@akerouanton @thaJeztah
go.mod: docker/docker and docker/cli v27.0.1-rc.1
7a53550 
diffs:

- https://github.com/docker/cli/compare/v26.1.4..v27.0.1-rc.1
- https://github.com/docker/docker/compare/v26.1.4..v27.0.1-rc.1

Co-authored-by: Albin Kerouanton <albinker@gmail.com
Signed-off-by: Albin Kerouanton <albinker@gmail.com
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the bump_docker_27 branch 2 times, most recently from 785d29e to c68c267 Compare June 20, 2024 21:45
@thaJeztah thaJeztah marked this pull request as ready for review June 20, 2024 21:46
@akerouanton @thaJeztah
go.mod: github.com/compose-spec/compose-go v2.1.3
8527e24 
full diff:

- compose-spec/compose-go@v2.1.2...v2.1.3

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jun 20, 2024

@akerouanton @glours I rebased @akerouanton's PRs and updated them to v27.0.1-rc.1; I combined both the docker/cli, docker/docker, and compose-go PRs in this one, I think this one should be ready to go.

I may do one more update after this, as one change went into docker/cli
that wasn't in the tag; docker/cli@v27.0.1-rc.1...b83cf58

But I think we're good otherwise.

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jun 20, 2024

Docker Hub is currently down, so CI is failing right now though 😅

@thaJeztah thaJeztah requested a review from glours June 20, 2024 22:37
@thaJeztah thaJeztah closed this Jun 20, 2024
@thaJeztah thaJeztah reopened this Jun 20, 2024
@thaJeztah thaJeztah self-assigned this Jun 20, 2024
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jun 20, 2024

Nice! Docker Hub is back; all green now 🥳

@glours
Copy link
Copy Markdown
Contributor

glours commented Jun 21, 2024 •
edited
Loading

Should we merge this PR with the rc1 version or wait for final one? If first choice, will the rc1 embedded in next Docker Desktop as well?

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jun 21, 2024

Heh, that's a good chicken-and-egg issue; If we wait for 27.0.1 to arrive, the version of compose that will be on download.docker.com will be the "current" release of compose. 🙈

cc @vvoland

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jun 21, 2024

I think it's probably fine to ship with rc.1 as it will be mostly identical to "ga". We could do one more revendor after this PR to get the actual commits that will be used for v27.0.1 GA (which would include the diff I linked above).

vvoland
vvoland approved these changes Jun 21, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@vvoland vvoland left a comment

Choose a reason for hiding this comment

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

There shouldn't be any changes between v27.0.1-rc.1 and the v27.0.0 in the vendored files:
moby/moby@v27.0.1-rc.1...master

So I think it's fine to go with the rc.1 vendor

glours
glours approved these changes Jun 21, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@glours glours left a comment

Choose a reason for hiding this comment

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

LGTM

@glours glours merged commit 6a000dc into docker:main Jun 21, 2024
@thaJeztah thaJeztah deleted the bump_docker_27 branch June 21, 2024 12:12
@vvoland vvoland mentioned this pull request Jun 24, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@glours glours glours approved these changes

+1 more reviewer

@vvoland vvoland vvoland approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@thaJeztah thaJeztah

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @glours @vvoland @akerouanton