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

chore(deps): bump github.com/docker/docker from v26.1.4 to v27.0.2 #2593

Merged
merged 1 commit into from
Jun 28, 2024

Conversation

thaJeztah
Copy link
Contributor

@thaJeztah thaJeztah commented Jun 18, 2024

Copy link

netlify bot commented Jun 18, 2024

Deploy Preview for testcontainers-go ready!

Name Link
🔨 Latest commit 648e47f
🔍 Latest deploy log https://app.netlify.com/sites/testcontainers-go/deploys/667ec76596be670008228825
😎 Deploy Preview https://deploy-preview-2593--testcontainers-go.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@mdelapenya
Copy link
Collaborator

Hey @thaJeztah I'm seeing an error in the compose module, which I updated its dependencies locally, bumping docker/cli to v27too. The error is:

::error file=compose.go,line=15,col=2::could not import github.com/docker/compose/v2/pkg/api (-: # github.com/docker/compose/v2/pkg/api
../../../../../../pkg/mod/github.com/docker/compose/v2@v2.27.1/pkg/api/dryrunclient.go:56:26: cannot use &DryRunClient{} (value of type *DryRunClient) as "github.com/docker/docker/client".APIClient value in variable declaration: *DryRunClient does not implement "github.com/docker/docker/client".APIClient (wrong type for method ImageImport)
                have ImageImport("context".Context, "github.com/docker/docker/api/types".ImageImportSource, string, image.ImportOptions) ("io".ReadCloser, error)
                want ImageImport("context".Context, image.ImportSource, string, image.ImportOptions) ("io".ReadCloser, error)
../../../../../../pkg/mod/github.com/docker/compose/v2@v2.27.1/pkg/api/dryrunclient.go:109:15: cannot use struct{NetworkMode string `json:",omitempty"`}{} (value of type struct{NetworkMode string "json:\",omitempty\""}) as struct{NetworkMode string "json:\",omitempty\""; Annotations map[string]string "json:\",omitempty\""} value in struct literal
../../../../../../pkg/mod/github.com/docker/compose/v2@v2.27.1/pkg/api/dryrunclient.go:431:38: cannot use source (variable of type "github.com/docker/docker/api/types".ImageImportSource) as image.ImportSource value in argument to d.apiClient.ImageImport) (typecheck)
::error file=compose_api.go,line=93,col=4::o.RemoveOrphans undefined (type *stackDownOptions has no field or method RemoveOrphans) (typecheck)
::error file=compose_api.go,line=106,col=4::o.Volumes undefined (type *stackDownOptions has no field or method Volumes) (typecheck)
::error file=compose_api.go,line=115,col=5::o.Images undefined (type *stackDownOptions has no field or method Images) (typecheck)
::error file=compose_api.go,line=117,col=5::o.Images undefined (type *stackDownOptions has no field or method Images) (typecheck)
::error file=compose_api.go,line=11,col=2::"strings" imported and not used (typecheck)

Something to mention to the compose team?

@thaJeztah
Copy link
Contributor Author

Hmm.. right so looks like Compose must be adjusted for v27, which I think was being worked on, but I wonder if that could cause issues with buildx, which depends on compose-go and cli 🤔

Oh, perhaps compose-go is not problematic here, so maybe we're good; at least, once compose was updated for v27?

cc @akerouanton @glours

@thaJeztah
Copy link
Contributor Author

thaJeztah commented Jun 20, 2024

Updated the compose module with docker/compose#11926 (rebase of docker/compose#11892), which is a WIP branch for updating compose to v27.0

@thaJeztah thaJeztah changed the title chore(deps): bump github.com/docker/docker from v26.1.4 to v27.0.0-rc.2 chore(deps): bump github.com/docker/docker from v26.1.4 to v27.0.1 Jun 25, 2024
@robertjndw
Copy link

Hey guys, any idea when this PR might be merged? 😅

mdelapenya
mdelapenya previously approved these changes Jun 28, 2024
Copy link
Collaborator

@mdelapenya mdelapenya left a comment

Choose a reason for hiding this comment

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

Thank you @thaJeztah for updating all references. Huge work.

LGTM!

@thaJeztah thaJeztah changed the title chore(deps): bump github.com/docker/docker from v26.1.4 to v27.0.1 chore(deps): bump github.com/docker/docker from v26.1.4 to v27.0.2 Jun 28, 2024
@thaJeztah thaJeztah marked this pull request as ready for review June 28, 2024 14:24
@thaJeztah thaJeztah requested a review from a team as a code owner June 28, 2024 14:24
Copy link
Collaborator

@mdelapenya mdelapenya left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@mdelapenya mdelapenya self-assigned this Jun 28, 2024
@mdelapenya mdelapenya added the dependencies Dependencies or external services label Jun 28, 2024
@mdelapenya mdelapenya merged commit 989b422 into testcontainers:main Jun 28, 2024
106 of 108 checks passed
@Mtze
Copy link

Mtze commented Jun 28, 2024

Thanks for fixing :)

@thaJeztah thaJeztah deleted the bump_docker_27 branch June 28, 2024 20:23
mdelapenya added a commit to mdelapenya/testcontainers-go that referenced this pull request Jul 2, 2024
* main:
  chore(deps): bump github.com/docker/docker from v26.1.4 to v27.0.2 (testcontainers#2593)
  fix: Rename TC_HOST environment variable to TESTCONTAINERS_HOST_OVERRIDE (testcontainers#2536)
  chore: test cleanups (testcontainers#2608)
  chore(ci): pass docker install type to the nightly build payload (testcontainers#2612)
  chore: run rootless mode in nighlty builds (testcontainers#2611)
  chore(deps): bump github.com/hashicorp/go-retryablehttp (testcontainers#2605)
  chore: improve log handling when container is stopping (testcontainers#2601)
mdelapenya added a commit that referenced this pull request Jul 2, 2024
* main:
  fix: never cache JSON representation of a container (#2606)
  chore: remove most uses of  TestcontainersConfig and deprecated TestcontainersConfig fields. (#2614)
  chore(deps): bump github.com/docker/docker from v27.0.2 to v27.0.3 (#2615)
  chore(deps): bump github.com/docker/docker from v26.1.4 to v27.0.2 (#2593)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Dependencies or external services
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants