From 870378ba1685b5dd73384845796dc1410b633806 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Fri, 17 Apr 2026 08:54:17 -0500 Subject: [PATCH 1/2] Move skopeo to go.podman.io With potential repo moves and cirus EOL, we have decided to begin preparing by making changes to the skopeo module name. See https://github.com/containers/go.podman.io/pull/6 for more information. Signed-off-by: Brent Baude --- Makefile | 2 +- cmd/skopeo/inspect.go | 2 +- cmd/skopeo/main.go | 2 +- go.mod | 2 +- integration/check_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7d24df910..8d99eb128 100644 --- a/Makefile +++ b/Makefile @@ -263,7 +263,7 @@ validate-docs: bin/skopeo hack/xref-helpmsgs-manpages test-unit-local: - $(GO) test $(SKOPEO_LDFLAGS) -tags "$(BUILDTAGS)" $$($(GO) list -tags "$(BUILDTAGS)" -e ./... | grep -v '^github\.com/containers/skopeo/\(integration\|vendor/.*\)$$') + $(GO) test $(SKOPEO_LDFLAGS) -tags "$(BUILDTAGS)" $$($(GO) list -tags "$(BUILDTAGS)" -e ./... | grep -v '^go\.podman\.io/skopeo/\(integration\|vendor/.*\)$$') vendor: $(GO) mod tidy diff --git a/cmd/skopeo/inspect.go b/cmd/skopeo/inspect.go index e3ffaeed3..3a67de86c 100644 --- a/cmd/skopeo/inspect.go +++ b/cmd/skopeo/inspect.go @@ -7,7 +7,6 @@ import ( "io" "strings" - "github.com/containers/skopeo/cmd/skopeo/inspect" "github.com/docker/distribution/registry/api/errcode" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" @@ -20,6 +19,7 @@ import ( "go.podman.io/image/v5/manifest" "go.podman.io/image/v5/transports" "go.podman.io/image/v5/types" + "go.podman.io/skopeo/cmd/skopeo/inspect" ) type inspectOptions struct { diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go index eea878ae4..fd706e58f 100644 --- a/cmd/skopeo/main.go +++ b/cmd/skopeo/main.go @@ -7,13 +7,13 @@ import ( "strings" "time" - "github.com/containers/skopeo/version" "github.com/sirupsen/logrus" "github.com/spf13/cobra" commonFlag "go.podman.io/common/pkg/flag" "go.podman.io/image/v5/pkg/cli/basetls/tlsdetails" "go.podman.io/image/v5/signature" "go.podman.io/image/v5/types" + "go.podman.io/skopeo/version" "go.podman.io/storage/pkg/reexec" ) diff --git a/go.mod b/go.mod index 11022bd60..2a8d56b72 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/containers/skopeo +module go.podman.io/skopeo // Minimum required golang version go 1.25.6 diff --git a/integration/check_test.go b/integration/check_test.go index d5a36eba3..64c041347 100644 --- a/integration/check_test.go +++ b/integration/check_test.go @@ -5,10 +5,10 @@ import ( "os/exec" "testing" - "github.com/containers/skopeo/version" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + "go.podman.io/skopeo/version" ) const ( From a1e4d9eccfecd5f678e6b41a307ac839f2f03c39 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Mon, 20 Apr 2026 07:51:16 -0500 Subject: [PATCH 2/2] Additional cleanup for go module changes Found some additional impact locations for the go module change. Signed-off-by: Brent Baude --- .cirrus.yml | 2 +- Makefile | 2 +- README.md | 1 - hack/get_ci_vm.sh | 2 +- install.md | 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 23d033730..5721542c5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,7 +11,7 @@ env: GOPATH: &gopath "/var/tmp/go" GOBIN: "${GOPATH}/bin" GOCACHE: "${GOPATH}/cache" - GOSRC: &gosrc "/var/tmp/go/src/github.com/containers/skopeo" + GOSRC: &gosrc "/var/tmp/go/src/go.podman.io/skopeo" # Required for consistency with containers/image CI SKOPEO_PATH: *gosrc CIRRUS_WORKING_DIR: *gosrc diff --git a/Makefile b/Makefile index 8d99eb128..1290797d7 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ INTERACTIVE := $(shell [ -t 0 ] && echo 1 || echo 0) ifeq ($(INTERACTIVE), 1) CONTAINER_CMD += -t endif -CONTAINER_GOSRC = /src/github.com/containers/skopeo +CONTAINER_GOSRC = /src/go.podman.io/skopeo CONTAINER_RUN ?= $(CONTAINER_CMD) --security-opt label=disable -v $(CURDIR):$(CONTAINER_GOSRC) -w $(CONTAINER_GOSRC) $(SKOPEO_CIDEV_CONTAINER_FQIN) EXTRA_LDFLAGS ?= diff --git a/README.md b/README.md index d9e79e534..caaad379a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ ---- ![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg) ![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/containers/skopeo) -[![Go Report Card](https://goreportcard.com/badge/github.com/containers/skopeo)](https://goreportcard.com/report/github.com/containers/skopeo) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10516/badge)](https://www.bestpractices.dev/projects/10516) `skopeo` is a command line utility that performs various operations on container images and image repositories. diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh index da19c1eca..0073bad3d 100755 --- a/hack/get_ci_vm.sh +++ b/hack/get_ci_vm.sh @@ -29,7 +29,7 @@ in_get_ci_vm() { if [[ "$1" == "--config" ]]; then in_get_ci_vm "$1" cat <