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

Update dependencies, keep up with API changes #276

Merged
merged 3 commits into from
Feb 6, 2024

Conversation

nalind
Copy link
Member

@nalind nalind commented Jan 31, 2024

  • bump github.com/containerd/containerd from v1.7.11 to v1.7.12
  • bump github.com/docker/docker from v24.0.7 to v25.0.1
  • bump github.com/fsouza/go-dockerclient from v1.9.7 to v1.10.1
  • bump github.com/containers/storage from v1.51.0 to v1.52.0
  • bump github.com/moby/buildkit from v0.11.4 to v0.12.4

The github.com/docker/docker/api/types.AuthConfig type was moved to the github.com/docker/docker/api/types/registry package, and the type alias that allowed us to not care has gone, so our declarations for variables of that type need to be updated.

@nalind
Copy link
Member Author

nalind commented Jan 31, 2024

This blocks containers/buildah#5301. I expect to tag a release once this is merged.

@mtrmac
Copy link
Contributor

mtrmac commented Jan 31, 2024

FWIW, Docker is not using Go modules the usual way, meaning go github.com/docker/… does not update transitive dependencies.

The dependencies are managed in a file named vendor.mod; I usually copy&paste the whole contents into the …/docker/docker caller’s go.mod, run go mod tidy, and then manually clean up.

Doing so here causes a few more (fairly minor) updates.

@nalind
Copy link
Member Author

nalind commented Jan 31, 2024

Oh, I wasn't aware. Worth doing since there's no automation in this repository for it.

* bump github.com/containerd/containerd from v1.7.11 to v1.7.13
* bump github.com/docker/docker from v24.0.7 to v25.0.1
* bump github.com/fsouza/go-dockerclient from v1.9.7 to v1.10.1
* bump github.com/containers/storage from v1.51.0 to v1.52.0
* bump github.com/moby/buildkit from v0.11.4 to v0.12.5

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
The github.com/docker/docker/api/types.AuthConfig type was moved to the
github.com/docker/docker/api/types/registry package, so our declarations
for variables of that type need to be updated.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@TomSweeneyRedHat
Copy link
Contributor

@nalind tests aren't hip

mtrmac added a commit to mtrmac/buildah that referenced this pull request Feb 1, 2024
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@nalind
Copy link
Member Author

nalind commented Feb 1, 2024

Unit tests are waiting on openshift/release#48288. I don't have the privileges to see what the errors are in the Go 1.21 build in Travis, but it's passing with 1.20.

@rhatdan
Copy link
Contributor

rhatdan commented Feb 2, 2024

Can we keep it at 1.20 for now?

Update which versions of Go Travis uses for testing to just use one
version.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@nalind
Copy link
Member Author

nalind commented Feb 2, 2024

I guess.

mtrmac added a commit to mtrmac/buildah that referenced this pull request Feb 5, 2024
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@nalind
Copy link
Member Author

nalind commented Feb 5, 2024

/test unit

Copy link
Contributor

openshift-ci bot commented Feb 5, 2024

@nalind: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@nalind
Copy link
Member Author

nalind commented Feb 5, 2024

Unit tests are passing now that openshift/release#48288 is merged, and Travis is only testing with 1.20.
We should probably move off Travis to something where the permissions allow us to view failure logs.

@rhatdan
Copy link
Contributor

rhatdan commented Feb 6, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 99efca2 into openshift:master Feb 6, 2024
3 checks passed
Copy link
Contributor

openshift-ci bot commented Feb 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nalind, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@nalind nalind deleted the update-deps branch February 6, 2024 13:58
mtrmac added a commit to mtrmac/buildah that referenced this pull request Feb 6, 2024
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac added a commit to mtrmac/buildah that referenced this pull request Feb 6, 2024
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants