Skip to content

build: update go deps, vendor docker-compose SDK, for #8234#8198

Merged
stasadev merged 1 commit intoddev:mainfrom
stasadev:20260303_stasadev_compose_and_buildx
Mar 18, 2026
Merged

build: update go deps, vendor docker-compose SDK, for #8234#8198
stasadev merged 1 commit intoddev:mainfrom
stasadev:20260303_stasadev_compose_and_buildx

Conversation

@stasadev
Copy link
Copy Markdown
Member

@stasadev stasadev commented Mar 3, 2026

The Issue

  1. We need to bump dependecies:

  2. We need to vendor docker-compose SDK for:

How This PR Solves The Issue

Bumps all vendor dependencies and adds a new SDK for docker-compose.

This is a separate PR, so #8234 will be easier to review once this is merged.

This PR adds two new files:

  • pkg/tools/tools.go, which can be used to import new libraries so go mod tidy does not complain.
  • pkg/tools/doc.go, which is needed because go test complains when a package has only build constraints, so this file was added.

Manual Testing Instructions

Automated Testing Overview

Release/Deployment Notes

@github-actions github-actions Bot added dependencies Pull requests that update a dependency file enhancement labels Mar 3, 2026
Copy link
Copy Markdown
Member

@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.

I don't know. Only 1,535 files changed. Seems like you could get to more than that :)

I guess these are the kind of times where not committing the vendor dir makes a lot of sense.

@rfay

This comment was marked as off-topic.

@stasadev stasadev force-pushed the 20260303_stasadev_compose_and_buildx branch 2 times, most recently from 5fefeb9 to 71f5166 Compare March 10, 2026 14:47
@rfay

This comment was marked as off-topic.

@rfay

This comment was marked as off-topic.

@stasadev stasadev force-pushed the 20260303_stasadev_compose_and_buildx branch from 71f5166 to e01a845 Compare March 12, 2026 20:40
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Mar 12, 2026

@stasadev stasadev force-pushed the 20260303_stasadev_compose_and_buildx branch from 7331560 to 2333779 Compare March 16, 2026 16:03
@stasadev
Copy link
Copy Markdown
Member Author

I'm going to convert this PR into one that bumps the vendor dir and continue the rest in a different PR.

We need to run tests on Windows, but this is a fork PR, and I need to know what happens in that case.

@stasadev stasadev force-pushed the 20260303_stasadev_compose_and_buildx branch 6 times, most recently from 20b0294 to 77cac45 Compare March 17, 2026 13:16
@stasadev stasadev changed the title feat: use docker-compose library, download docker-buildx, fixes #7915 build: update all vendor module deps, for #8234 Mar 17, 2026
@stasadev stasadev force-pushed the 20260303_stasadev_compose_and_buildx branch from 335578e to 830501f Compare March 17, 2026 21:42
@stasadev stasadev force-pushed the 20260303_stasadev_compose_and_buildx branch 2 times, most recently from da927d0 to 410e7ce Compare March 17, 2026 22:37
@stasadev stasadev changed the title build: update all vendor module deps, for #8234 build: update go deps, vendor docker-compose SDK, for #8234 Mar 17, 2026
@stasadev stasadev force-pushed the 20260303_stasadev_compose_and_buildx branch from 410e7ce to d12db66 Compare March 17, 2026 22:59
Comment thread pkg/tools/tools.go
Comment on lines +20 to +27
// For new Docker Compose SDK https://github.com/ddev/ddev/pull/8234
import (
_ "github.com/docker/cli/cli"
_ "github.com/docker/cli/cli/streams"
_ "github.com/docker/compose/v5/cmd/display"
_ "github.com/docker/compose/v5/pkg/api"
_ "github.com/docker/compose/v5/pkg/compose"
)
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.

My plan is to add new imports here in vendor PRs, and then remove them in the PRs where they are actually used.
This way, we can split the logic for easier review.

P.S. It was painful to write this comment because GitHub lags heavily with such a large PR.

@stasadev stasadev marked this pull request as ready for review March 17, 2026 23:02
@stasadev stasadev requested review from a team as code owners March 17, 2026 23:02
@stasadev stasadev requested a review from rfay March 17, 2026 23:02
Copy link
Copy Markdown
Member

@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.

Thanks, it looks quite safe. Nice work doing it this way.

@stasadev stasadev merged commit 178741d into ddev:main Mar 18, 2026
46 checks passed
@stasadev stasadev deleted the 20260303_stasadev_compose_and_buildx branch March 18, 2026 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file maintenance

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants