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.

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

Jump to bottom

build: upgrade docker/docker to v28 usages, followup to #7078, fixes #7079 #7081

Merged
merged 3 commits into from
Mar 14, 2025
Merged

build: upgrade docker/docker to v28 usages, followup to #7078, fixes #7079 #7081

merged 3 commits into from
Mar 14, 2025

Conversation

rfay
Copy link
Member

@rfay rfay commented Mar 14, 2025

The Issue

Update docker/docker to current v28 usage.

Manual Testing Instructions

If it passes tests maybe we're ok.

@github-actions github-actions bot added dependencies Pull requests that update a dependency file maintenance labels Mar 14, 2025
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 14, 2025 •
edited
Loading

Download the artifacts for this pull request:

See Testing a PR.

Open in GitHub Codespaces

@rfay rfay requested a review from stasadev March 14, 2025 03:33
@rfay rfay marked this pull request as ready for review March 14, 2025 03:33
@rfay rfay requested a review from a team as a code owner March 14, 2025 03:33
@rfay rfay force-pushed the 20250313_rfay_try_docker_upgrade branch from 11445f5 to 4629aa5 Compare March 14, 2025 13:11
@stasadev stasadev requested a review from a team as a code owner March 14, 2025 13:59
@stasadev
Copy link
Member

I pushed a new commit, where I searched for github.com/imdario/mergo and replaced it with dario.cat/mergo

The last time I tried to do this in 2024, it failed because some other package required old named mergo, but now it worked fine.

Then I removed the whole indirect section from go.mod and ran:

go get -u ./...
go mod vendor
go mod tidy

Which updated the entire indirect section and removed some unused dependencies.

stasadev
stasadev approved these changes Mar 14, 2025
View reviewed changes
Copy link
Member

@stasadev stasadev left a comment

Choose a reason for hiding this comment

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

Approved.

rfay
rfay commented Mar 14, 2025
View reviewed changes
Copy link
Member Author

@rfay rfay left a comment

Choose a reason for hiding this comment

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

Seems fine to me when it passes tests. I do wish they wouldn't do weird vanity URLs for packages like this. Not sure how that helps anybody.

@rfay rfay merged commit 4195605 into ddev:main Mar 14, 2025
20 checks passed
@rfay rfay deleted the 20250313_rfay_try_docker_upgrade branch March 14, 2025 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stasadev stasadev stasadev approved these changes

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file maintenance
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rfay @stasadev