Skip to content

Commit 724b9f8

Browse files
committed
downgrade minimum required version of hcsshim to v0.10.0
This updates the minimum required version for hcsshim's "osversion" package to v0.10.0, which is the first (non-rc) version providine the `CheckHostAndContainerCompat` utility that's used, which was added in [microsoft/hcsshim@640a560]. Containerd 1.6 LTS currently uses hcsshim [v0.9.10], so would need to be updated to use the platforms module. Containerd 1.7 already uses hcsshim [v0.11.4], so can continue using that version (or higher if needed). This patch downgrades the required version to the lowest version providing the `CheckHostAndContainerCompat`, to make Go modules "minimum version selection" work, and to allow consumers to select a version of the hcsshim needed for their use (any version higher than v0.10.0). [microsoft/hcsshim@640a560]: microsoft/hcsshim@640a560 [v0.9.10]: https://github.com/containerd/containerd/blob/v1.6.27/go.mod#L9 [v0.11.4]: https://github.com/containerd/containerd/blob/v1.7.12/go.mod#L10 Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent d9a63aa commit 724b9f8

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module github.com/containerd/platforms
33
go 1.20
44

55
require (
6-
github.com/Microsoft/hcsshim v0.12.0-rc.2
6+
github.com/Microsoft/hcsshim v0.10.0
77
github.com/containerd/log v0.1.0
88
github.com/opencontainers/image-spec v1.1.0-rc5
99
github.com/stretchr/testify v1.8.4
10-
golang.org/x/sys v0.16.0
10+
golang.org/x/sys v0.10.0
1111
)
1212

1313
require (

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/Microsoft/hcsshim v0.12.0-rc.2 h1:gfKebjq3Mq17Ys+4cjE8vc2h6tZVeqCGb9a7vBVqpAk=
2-
github.com/Microsoft/hcsshim v0.12.0-rc.2/go.mod h1:G2TZhBED5frlh/hsuxV5CDh/ylkSFknPAMPpQg9owQw=
1+
github.com/Microsoft/hcsshim v0.10.0 h1:PbvoxdUGgXxyirmN5Oncp3POLkxEG5LbWCEBfWmHTGA=
2+
github.com/Microsoft/hcsshim v0.10.0/go.mod h1:3j1trOamcUdi86J5Tr5+1BpqMjSv/QeRWkX2whBF6dY=
33
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
44
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
55
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -18,8 +18,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
1818
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
1919
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
2020
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21-
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
22-
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
21+
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
22+
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2323
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2424
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2525
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)