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 github.com/containerd/containerd to 1.5.9 #1433

Merged
merged 2 commits into from
Jan 6, 2022

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Jan 6, 2022

go get github.com/containerd/containerd@latest

... because 1.5.9 contains a vulnerability fix, and we want to silence scanners.

NOTE: c/image DOES NOT use the vulnerable code that was fixed in containerd 1.5.9, so it is NOT vulnerable to GHSA-mvff-h3cj-wj9c .


This PR also updates opencontainers/image-spec to fix using c/image along with other Go modules that reference the 1.0.2 release tag, like containers/buildah#3678 (that includes this containerd update).

mtrmac added 2 commits January 6, 2022 21:46
> go get github.com/opencontainers/image-spec@a5463b7f9c8451553af3adcba2cab538469df00c

Primarily we want to use a 1.0.3-0... version rather than 1.0.2-0..., so that
dependencies on 1.0.2 don't cause any c/image user to use 1.0.2 instead of
the later main-branch code.

Go has some logic to prevent using pseudo-version that don't follow
a released version (which is the case here, where 1.0.2 is on a branch,
and we want to use a main-branch commit instead); luckily some later
PRs on the main branch include the full contents of the 1.0.2 branch.
So, update a bit further along the main branch.

(Using a yet later commit would trigger updates to golang/x/crypto
which we don't want to deal with in this PR.)

Signed-off-by: Miloslav Trmač <[email protected]>
> go get github.com/containerd/containerd@latest

... because 1.5.9 contains a vulnerability fix, and we
want to silence scanners.

NOTE: c/image DOES NOT use the vulnerable code that
was fixed in containerd 1.5.9, so it is NOT vulnerable to
GHSA-mvff-h3cj-wj9c .

Signed-off-by: Miloslav Trmač <[email protected]>
mtrmac added a commit to mtrmac/skopeo that referenced this pull request Jan 6, 2022
> go get github.com/opencontainers/image-spec@a5463b7f9c8451553af3adcba2cab538469df00c
> make vendor

Primarily we want to use a 1.0.3-0... version rather than 1.0.2-0..., so that
dependencies on 1.0.2 don't cause Skopeo to use 1.0.2 instead of
the later main-branch code.

Go has some logic to prevent using pseudo-version that don't follow
a released version (which is the case here, where 1.0.2 is on a branch,
and we want to use a main-branch commit instead); luckily some later
PRs on the main branch include the full contents of the 1.0.2 branch.
So, update a bit further along the main branch.

This particular commit corresponds to the choice in
containers/image#1433 .

Signed-off-by: Miloslav Trmač <[email protected]>
@rhatdan rhatdan merged commit 551c31f into containers:main Jan 6, 2022
@mtrmac mtrmac deleted the dep-updates branch January 6, 2022 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants