Merge pull request #272 from crazy-max/switch-containerd-platforms

switch to github.com/containerd/platforms
crazy-max · Dec 22, 2024 · 42a9c33 · 42a9c33
2 parents 2851f29 + 8b842ac
commit 42a9c33
Show file tree

Hide file tree

Showing 26 changed files with 263 additions and 90 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -54,6 +54,8 @@ linters-settings:
     rules:
       main:
         deny:
+          - pkg: "github.com/containerd/containerd/platforms"
+            desc: The containerd platforms package was migrated to a separate module. Use github.com/containerd/platforms instead.
           - pkg: "io/ioutil"
             desc: The io/ioutil package has been deprecated.
   forbidigo:

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	github.com/alecthomas/kong v0.9.0
-	github.com/containerd/containerd v1.7.18
+	github.com/containerd/platforms v0.2.1
 	github.com/containers/image/v5 v5.31.1
 	github.com/docker/docker v26.1.4+incompatible
 	github.com/mholt/archiver/v4 v4.0.0-alpha.8

diff --git a/go.sum b/go.sum
@@ -65,12 +65,12 @@ github.com/connesc/cipherio v0.2.1 h1:FGtpTPMbKNNWByNrr9aEBtaJtXjqOzkIXNYJp6OEyc
 github.com/connesc/cipherio v0.2.1/go.mod h1:ukY0MWJDFnJEbXMQtOcn2VmTpRfzcTz4OoVrWGGJZcA=
 github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0=
 github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0=
-github.com/containerd/containerd v1.7.18 h1:jqjZTQNfXGoEaZdW1WwPU0RqSn1Bm2Ay/KJPUuO8nao=
-github.com/containerd/containerd v1.7.18/go.mod h1:IYEk9/IO6wAPUz2bCMVUbsfXjzw5UNP5fLz4PsUygQ4=
 github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
 github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
+github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
 github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G/ZW/0kEe2oEKCdS/ZxIyoCU=
 github.com/containerd/stargz-snapshotter/estargz v0.15.1/go.mod h1:gr2RNwukQ/S9Nv33Lt6UC7xEx58C+LHRdoqbEKjz1Kk=
 github.com/containers/image/v5 v5.31.1 h1:3x9soI6Biml/GiDLpkSmKrkRSwVGctxu/vONpoUdklA=

diff --git a/internal/app/undock.go b/internal/app/undock.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containerd/containerd/platforms"
+	"github.com/containerd/platforms"
 	"github.com/crazy-max/undock/internal/config"
 	ximage "github.com/crazy-max/undock/pkg/extractor/image"
 	"github.com/crazy-max/undock/pkg/image"

diff --git a/pkg/extractor/image/image.go b/pkg/extractor/image/image.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containerd/containerd/platforms"
+	"github.com/containerd/platforms"
 	"github.com/containers/image/v5/manifest"
 	"github.com/crazy-max/undock/pkg/extractor"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"

diff --git a/vendor/github.com/containerd/containerd/NOTICE b/vendor/github.com/containerd/containerd/NOTICE
diff --git a/vendor/github.com/containerd/platforms/.gitattributes b/vendor/github.com/containerd/platforms/.gitattributes
diff --git a/vendor/github.com/containerd/platforms/.golangci.yml b/vendor/github.com/containerd/platforms/.golangci.yml
diff --git a/.../github.com/containerd/containerd/LICENSE → ...r/github.com/containerd/platforms/LICENSE b/.../github.com/containerd/containerd/LICENSE → ...r/github.com/containerd/platforms/LICENSE
diff --git a/vendor/github.com/containerd/platforms/README.md b/vendor/github.com/containerd/platforms/README.md
diff --git a/...ontainerd/containerd/platforms/compare.go → ...ithub.com/containerd/platforms/compare.go b/...ontainerd/containerd/platforms/compare.go → ...ithub.com/containerd/platforms/compare.go
diff --git a/...ontainerd/containerd/platforms/cpuinfo.go → ...ithub.com/containerd/platforms/cpuinfo.go b/...ontainerd/containerd/platforms/cpuinfo.go → ...ithub.com/containerd/platforms/cpuinfo.go
diff --git a/...erd/containerd/platforms/cpuinfo_linux.go → ...com/containerd/platforms/cpuinfo_linux.go b/...erd/containerd/platforms/cpuinfo_linux.go → ...com/containerd/platforms/cpuinfo_linux.go
diff --git a/...erd/containerd/platforms/cpuinfo_other.go → ...com/containerd/platforms/cpuinfo_other.go b/...erd/containerd/platforms/cpuinfo_other.go → ...com/containerd/platforms/cpuinfo_other.go
diff --git a/...ntainerd/containerd/platforms/database.go → ...thub.com/containerd/platforms/database.go b/...ntainerd/containerd/platforms/database.go → ...thub.com/containerd/platforms/database.go
diff --git a/...ntainerd/containerd/platforms/defaults.go → ...thub.com/containerd/platforms/defaults.go b/...ntainerd/containerd/platforms/defaults.go → ...thub.com/containerd/platforms/defaults.go
diff --git a/...d/containerd/platforms/defaults_darwin.go → ...m/containerd/platforms/defaults_darwin.go b/...d/containerd/platforms/defaults_darwin.go → ...m/containerd/platforms/defaults_darwin.go
diff --git a/.../containerd/platforms/defaults_freebsd.go → .../containerd/platforms/defaults_freebsd.go b/.../containerd/platforms/defaults_freebsd.go → .../containerd/platforms/defaults_freebsd.go
diff --git a/...erd/containerd/platforms/defaults_unix.go → ...com/containerd/platforms/defaults_unix.go b/...erd/containerd/platforms/defaults_unix.go → ...com/containerd/platforms/defaults_unix.go
diff --git a/.../containerd/platforms/defaults_windows.go → .../containerd/platforms/defaults_windows.go b/.../containerd/platforms/defaults_windows.go → .../containerd/platforms/defaults_windows.go
diff --git a/vendor/github.com/containerd/platforms/errors.go b/vendor/github.com/containerd/platforms/errors.go
diff --git a/vendor/github.com/containerd/platforms/platform_compat_windows.go b/vendor/github.com/containerd/platforms/platform_compat_windows.go