Skip to content

Commit 8b81a78

Browse files
thaJeztahthaJeztah
committed
[release/1.6] go.mod: update image-spec to merge-commit of v1 into main
This is a follow-up to 7ede40c, where we pinned the version of this dependency to prevent go modules rolling it back. This patch updates the version to use the merge-commit that merged the v1.0 release branch back to the main branch in github.com/opencontainers/image-spec, so that go modules considers it "more recent" and doesn't roll back. Updating does not introduce changes in the vendored code, as changs of the merged commits were either already in the main branch, or only affected non-code files. - full diff: opencontainers/image-spec@693428a...c5a74bc - raw diff: https://github.com/opencontainers/image-spec/compare/693428a734f5..c5a74bcca799 Thanks to Tõnis Tiigi for pointing to this commit! Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 5ff8fce commit 8b81a78

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/moby/sys/signal v0.6.0
4343
github.com/moby/sys/symlink v0.2.0
4444
github.com/opencontainers/go-digest v1.0.0
45-
github.com/opencontainers/image-spec v1.0.2 // see replace for the actual version
45+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
4646
github.com/opencontainers/runc v1.1.1
4747
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
4848
github.com/opencontainers/selinux v1.10.0
@@ -135,8 +135,6 @@ require (
135135
replace (
136136
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
137137

138-
// prevent go mod from rolling this back to the last tagged release; see https://github.com/containerd/containerd/pull/6739
139-
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5
140138
// urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092
141139
github.com/urfave/cli => github.com/urfave/cli v1.22.1
142140
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63

‎go.sum‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,12 @@ github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQ
700700
github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
701701
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
702702
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
703-
github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5 h1:q37d91F6BO4Jp1UqWiun0dUFYaqv6WsKTLTCaWv+8LY=
703+
github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
704+
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
704705
github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
706+
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
707+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec=
708+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
705709
github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
706710
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
707711
github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=

‎integration/client/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/containerd/typeurl v1.0.2
1414
github.com/gogo/protobuf v1.3.2
1515
github.com/opencontainers/go-digest v1.0.0
16-
github.com/opencontainers/image-spec v1.0.2
16+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
1717
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
1818
github.com/sirupsen/logrus v1.8.1
1919
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e

‎vendor/modules.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ github.com/modern-go/reflect2
320320
## explicit; go 1.13
321321
github.com/opencontainers/go-digest
322322
github.com/opencontainers/go-digest/digestset
323-
# github.com/opencontainers/image-spec v1.0.2 => github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5
323+
# github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
324324
## explicit
325325
github.com/opencontainers/image-spec/identity
326326
github.com/opencontainers/image-spec/specs-go
@@ -748,6 +748,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
748748
## explicit; go 1.12
749749
sigs.k8s.io/yaml
750750
# github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
751-
# github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5
752751
# github.com/urfave/cli => github.com/urfave/cli v1.22.1
753752
# google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63

0 commit comments

Comments
 (0)