diff --git a/Makefile b/Makefile index 82cf8e6da5..d7b758b015 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ ifdef SOURCE_DATE_EPOCH else BUILD_INFO ?= $(shell date "+$(DATE_FMT)") endif -LIBPOD := ${PROJECT}/v5/libpod +LIBPOD := ${PROJECT}/v6/libpod GOFLAGS ?= -trimpath LDFLAGS_PODMAN ?= \ $(if $(GIT_COMMIT),-X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT),) \ @@ -131,7 +131,7 @@ LDFLAGS_PODMAN ?= \ $(if $(BUILD_ORIGIN),-X "$(LIBPOD)/define.buildOrigin=$(BUILD_ORIGIN)",) \ -X $(LIBPOD)/config._installPrefix=$(PREFIX) \ -X $(LIBPOD)/config._etcDir=$(ETCDIR) \ - -X $(PROJECT)/v5/pkg/systemd/quadlet._binDir=$(BINDIR) \ + -X $(PROJECT)/v6/pkg/systemd/quadlet._binDir=$(BINDIR) \ -X go.podman.io/image/v5/signature/internal/sequoia.sequoiaLibraryDir='"$(SEQUOIA_SONAME_DIR)"' \ -X go.podman.io/common/pkg/config.additionalHelperBinariesDir=$(HELPER_BINARIES_DIR)\ $(EXTRA_LDFLAGS) diff --git a/README.md b/README.md index c1f8ad3b35..5993254ebc 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # Podman: A tool for managing OCI containers and pods ![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg) ![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/containers/podman) -[![Go Report Card](https://goreportcard.com/badge/github.com/containers/podman/v5)](https://goreportcard.com/report/github.com/containers/podman/v5) +[![Go Report Card](https://goreportcard.com/badge/github.com/containers/podman/v6)](https://goreportcard.com/report/github.com/containers/podman/v6) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10499/badge)](https://www.bestpractices.dev/projects/10499) [![LFX Health Score](https://insights.linuxfoundation.org/api/badge/health-score?project=containers-podman)](https://insights.linuxfoundation.org/project/containers-podman) diff --git a/cmd/podman-testing/create.go b/cmd/podman-testing/create.go index 1f42798d3d..654e5af041 100644 --- a/cmd/podman-testing/create.go +++ b/cmd/podman-testing/create.go @@ -5,8 +5,8 @@ package main import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/internal/domain/entities" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/internal/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman-testing/data.go b/cmd/podman-testing/data.go index e8fc8a0ede..bdac66c609 100644 --- a/cmd/podman-testing/data.go +++ b/cmd/podman-testing/data.go @@ -6,8 +6,8 @@ import ( "errors" "os" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/internal/domain/entities" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/internal/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman-testing/layer.go b/cmd/podman-testing/layer.go index 6def412f38..6146846801 100644 --- a/cmd/podman-testing/layer.go +++ b/cmd/podman-testing/layer.go @@ -6,8 +6,8 @@ import ( "errors" "os" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/internal/domain/entities" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/internal/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman-testing/main.go b/cmd/podman-testing/main.go index 39968bca99..958fc7150f 100644 --- a/cmd/podman-testing/main.go +++ b/cmd/podman-testing/main.go @@ -10,10 +10,10 @@ import ( "os/exec" "syscall" - _ "github.com/containers/podman/v5/cmd/podman/completion" - ientities "github.com/containers/podman/v5/internal/domain/entities" - "github.com/containers/podman/v5/internal/domain/infra" - "github.com/containers/podman/v5/pkg/domain/entities" + _ "github.com/containers/podman/v6/cmd/podman/completion" + ientities "github.com/containers/podman/v6/internal/domain/entities" + "github.com/containers/podman/v6/internal/domain/infra" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" diff --git a/cmd/podman-testing/remove.go b/cmd/podman-testing/remove.go index 234d207b92..e3c30ee5f1 100644 --- a/cmd/podman-testing/remove.go +++ b/cmd/podman-testing/remove.go @@ -5,8 +5,8 @@ package main import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/internal/domain/entities" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/internal/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman-testing/store_supported.go b/cmd/podman-testing/store_supported.go index 9cd2843880..3955ae0ad0 100644 --- a/cmd/podman-testing/store_supported.go +++ b/cmd/podman-testing/store_supported.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/storage" "go.podman.io/storage/types" ) diff --git a/cmd/podman-wslkerninst/main.go b/cmd/podman-wslkerninst/main.go index c2ebc60240..c16bce8839 100644 --- a/cmd/podman-wslkerninst/main.go +++ b/cmd/podman-wslkerninst/main.go @@ -10,7 +10,7 @@ import ( "time" "unsafe" - "github.com/containers/podman/v5/pkg/machine/wsl/wutil" + "github.com/containers/podman/v6/pkg/machine/wsl/wutil" "github.com/sirupsen/logrus" "golang.org/x/sys/windows/svc/eventlog" ) diff --git a/cmd/podman/artifact/add.go b/cmd/podman/artifact/add.go index 3e5903eff3..f5f722c93b 100644 --- a/cmd/podman/artifact/add.go +++ b/cmd/podman/artifact/add.go @@ -4,10 +4,10 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/utils" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/utils" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/artifact/artifact.go b/cmd/podman/artifact/artifact.go index bae8187530..f4a53c5646 100644 --- a/cmd/podman/artifact/artifact.go +++ b/cmd/podman/artifact/artifact.go @@ -1,8 +1,8 @@ package artifact import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/artifact/extract.go b/cmd/podman/artifact/extract.go index e4246d4077..de12617bb4 100644 --- a/cmd/podman/artifact/extract.go +++ b/cmd/podman/artifact/extract.go @@ -1,9 +1,9 @@ package artifact import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/artifact/inspect.go b/cmd/podman/artifact/inspect.go index ca51612001..964da1dd36 100644 --- a/cmd/podman/artifact/inspect.go +++ b/cmd/podman/artifact/inspect.go @@ -3,11 +3,11 @@ package artifact import ( "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/inspect" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/inspect" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" ) diff --git a/cmd/podman/artifact/list.go b/cmd/podman/artifact/list.go index 86e5164e73..c17261a497 100644 --- a/cmd/podman/artifact/list.go +++ b/cmd/podman/artifact/list.go @@ -5,10 +5,10 @@ import ( "os" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/spf13/cobra" diff --git a/cmd/podman/artifact/pull.go b/cmd/podman/artifact/pull.go index 12e4e385d6..fe90422238 100644 --- a/cmd/podman/artifact/pull.go +++ b/cmd/podman/artifact/pull.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/buildah/pkg/cli" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/artifact/push.go b/cmd/podman/artifact/push.go index e20315fea4..122f3fb69b 100644 --- a/cmd/podman/artifact/push.go +++ b/cmd/podman/artifact/push.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/buildah/pkg/cli" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/artifact/rm.go b/cmd/podman/artifact/rm.go index f57a3f559b..eab35302ae 100644 --- a/cmd/podman/artifact/rm.go +++ b/cmd/podman/artifact/rm.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/auto-update.go b/cmd/podman/auto-update.go index 35fc96661e..75e99e9e8e 100644 --- a/cmd/podman/auto-update.go +++ b/cmd/podman/auto-update.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/client.go b/cmd/podman/client.go index 46c889b955..d04007f378 100644 --- a/cmd/podman/client.go +++ b/cmd/podman/client.go @@ -1,6 +1,6 @@ package main -import "github.com/containers/podman/v5/libpod/define" +import "github.com/containers/podman/v6/libpod/define" type clientInfo struct { OSArch string `json:"OS"` diff --git a/cmd/podman/client_supported.go b/cmd/podman/client_supported.go index 995154fa09..8cd8bd0eac 100644 --- a/cmd/podman/client_supported.go +++ b/cmd/podman/client_supported.go @@ -3,7 +3,7 @@ package main import ( - "github.com/containers/podman/v5/pkg/machine/provider" + "github.com/containers/podman/v6/pkg/machine/provider" ) func getProvider() (string, error) { diff --git a/cmd/podman/common/build.go b/cmd/podman/common/build.go index de9664850a..97ca3cb7d3 100644 --- a/cmd/podman/common/build.go +++ b/cmd/podman/common/build.go @@ -19,10 +19,10 @@ import ( buildahUtil "github.com/containers/buildah/pkg/util" encconfig "github.com/containers/ocicrypt/config" enchelpers "github.com/containers/ocicrypt/helpers" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/env" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/env" "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go index 5cad945e29..3dc15192c9 100644 --- a/cmd/podman/common/completion.go +++ b/cmd/podman/common/completion.go @@ -13,14 +13,14 @@ import ( "strings" "unicode" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/inspect" - "github.com/containers/podman/v5/pkg/signal" - systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/inspect" + "github.com/containers/podman/v6/pkg/signal" + systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" + "github.com/containers/podman/v6/pkg/util" securejoin "github.com/cyphar/filepath-securejoin" "github.com/spf13/cobra" libimageDefine "go.podman.io/common/libimage/define" diff --git a/cmd/podman/common/completion_test.go b/cmd/podman/common/completion_test.go index 7ff64a8971..e806c69359 100644 --- a/cmd/podman/common/completion_test.go +++ b/cmd/podman/common/completion_test.go @@ -3,7 +3,7 @@ package common_test import ( "testing" - "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/common" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" ) diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index cb55f74d4a..91bd68f70d 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -4,9 +4,9 @@ import ( "errors" "time" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index beb995ed93..65c0f793a5 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -1,9 +1,9 @@ package common import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" ) func ulimits() []string { diff --git a/cmd/podman/common/create_test.go b/cmd/podman/common/create_test.go index dee4cf0cb4..27835999a0 100644 --- a/cmd/podman/common/create_test.go +++ b/cmd/podman/common/create_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go index cd73b06889..da7844fe67 100644 --- a/cmd/podman/common/default.go +++ b/cmd/podman/common/default.go @@ -1,7 +1,7 @@ package common import ( - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/registry" ) var ( diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go index 69c39ae1a3..addc55c4d5 100644 --- a/cmd/podman/common/netflags.go +++ b/cmd/podman/common/netflags.go @@ -5,11 +5,11 @@ import ( "fmt" "net" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutil" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/libnetwork/types" diff --git a/cmd/podman/common/sign.go b/cmd/podman/common/sign.go index b9551a866e..a85295bdfa 100644 --- a/cmd/podman/common/sign.go +++ b/cmd/podman/common/sign.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/ssh" diff --git a/cmd/podman/completion/completion.go b/cmd/podman/completion/completion.go index b6299f4048..d420a0206a 100644 --- a/cmd/podman/completion/completion.go +++ b/cmd/podman/completion/completion.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" commonComp "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/compose.go b/cmd/podman/compose.go index 8ceb08be18..09fa6429ae 100644 --- a/cmd/podman/compose.go +++ b/cmd/podman/compose.go @@ -12,8 +12,8 @@ import ( "strings" "text/template" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/compose_machine.go b/cmd/podman/compose_machine.go index f705499d5b..e9b5db31d4 100644 --- a/cmd/podman/compose_machine.go +++ b/cmd/podman/compose_machine.go @@ -5,7 +5,7 @@ package main import ( "net/url" - "github.com/containers/podman/v5/internal/localapi" + "github.com/containers/podman/v6/internal/localapi" ) func getMachineConn(connectionURI string, parsedConnection *url.URL) (string, error) { diff --git a/cmd/podman/compose_machine_unix.go b/cmd/podman/compose_machine_unix.go index c6537e8831..65c3db6731 100644 --- a/cmd/podman/compose_machine_unix.go +++ b/cmd/podman/compose_machine_unix.go @@ -5,7 +5,7 @@ package main import ( "errors" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) func extractConnectionString(podmanSocket *define.VMFile, _ *define.VMFile) (string, error) { diff --git a/cmd/podman/compose_machine_windows.go b/cmd/podman/compose_machine_windows.go index 68abbe5808..ed6fce2eec 100644 --- a/cmd/podman/compose_machine_windows.go +++ b/cmd/podman/compose_machine_windows.go @@ -4,7 +4,7 @@ import ( "errors" "path/filepath" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) func extractConnectionString(_ *define.VMFile, podmanPipe *define.VMFile) (string, error) { diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go index c1c20cfbbe..80add08e1f 100644 --- a/cmd/podman/containers/attach.go +++ b/cmd/podman/containers/attach.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/checkpoint.go b/cmd/podman/containers/checkpoint.go index 53fdae8fa5..af5af6f1c7 100644 --- a/cmd/podman/containers/checkpoint.go +++ b/cmd/podman/containers/checkpoint.go @@ -7,13 +7,13 @@ import ( "strings" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/criu" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/criu" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/storage/pkg/archive" diff --git a/cmd/podman/containers/cleanup.go b/cmd/podman/containers/cleanup.go index dd10f41908..deb32df733 100644 --- a/cmd/podman/containers/cleanup.go +++ b/cmd/podman/containers/cleanup.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/containers/clone.go b/cmd/podman/containers/clone.go index 5f01dfd7d2..8404f2db1c 100644 --- a/cmd/podman/containers/clone.go +++ b/cmd/podman/containers/clone.go @@ -3,10 +3,10 @@ package containers import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/commit.go b/cmd/podman/containers/commit.go index 1d91b81a2c..35a690d98d 100644 --- a/cmd/podman/containers/commit.go +++ b/cmd/podman/containers/commit.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/container.go b/cmd/podman/containers/container.go index 4472642683..f950901261 100644 --- a/cmd/podman/containers/container.go +++ b/cmd/podman/containers/container.go @@ -1,8 +1,8 @@ package containers import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go index ae42eac7b4..74648c5e6c 100644 --- a/cmd/podman/containers/cp.go +++ b/cmd/podman/containers/cp.go @@ -13,11 +13,11 @@ import ( "errors" buildahCopiah "github.com/containers/buildah/copier" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/copy" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/copy" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/storage/pkg/archive" diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 668cbdfa56..9920f6b20b 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -10,14 +10,14 @@ import ( "strings" "github.com/containers/buildah/pkg/cli" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" diff --git a/cmd/podman/containers/diff.go b/cmd/podman/containers/diff.go index fbf5d88016..0b564f5fc6 100644 --- a/cmd/podman/containers/diff.go +++ b/cmd/podman/containers/diff.go @@ -3,12 +3,12 @@ package containers import ( "errors" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/diff" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/diff" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/exec.go b/cmd/podman/containers/exec.go index 73a06f0d4f..3089969fae 100644 --- a/cmd/podman/containers/exec.go +++ b/cmd/podman/containers/exec.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - envLib "github.com/containers/podman/v5/pkg/env" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + envLib "github.com/containers/podman/v6/pkg/env" + "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/exists.go b/cmd/podman/containers/exists.go index 94fcded0ee..32f5a7b96a 100644 --- a/cmd/podman/containers/exists.go +++ b/cmd/podman/containers/exists.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/export.go b/cmd/podman/containers/export.go index b91c7cf77b..1b5b27fa90 100644 --- a/cmd/podman/containers/export.go +++ b/cmd/podman/containers/export.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "golang.org/x/term" diff --git a/cmd/podman/containers/init.go b/cmd/podman/containers/init.go index 04de847dbc..475166ffdd 100644 --- a/cmd/podman/containers/init.go +++ b/cmd/podman/containers/init.go @@ -3,11 +3,11 @@ package containers import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/inspect.go b/cmd/podman/containers/inspect.go index b23b23fef9..3e694091d4 100644 --- a/cmd/podman/containers/inspect.go +++ b/cmd/podman/containers/inspect.go @@ -1,12 +1,12 @@ package containers import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/inspect" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/inspect" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/kill.go b/cmd/podman/containers/kill.go index d81e61d5e0..953eb68bb6 100644 --- a/cmd/podman/containers/kill.go +++ b/cmd/podman/containers/kill.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/signal" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/signal" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/list.go b/cmd/podman/containers/list.go index 2a044eb23c..f22061e3ef 100644 --- a/cmd/podman/containers/list.go +++ b/cmd/podman/containers/list.go @@ -1,8 +1,8 @@ package containers import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go index 09ed18f3a2..56886a1661 100644 --- a/cmd/podman/containers/logs.go +++ b/cmd/podman/containers/logs.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go index 56c654ca42..6a07ef11e8 100644 --- a/cmd/podman/containers/mount.go +++ b/cmd/podman/containers/mount.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" ) diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 339d438ddb..b85aa639bd 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/port.go b/cmd/podman/containers/port.go index 4ecb680b4f..802c5858ae 100644 --- a/cmd/podman/containers/port.go +++ b/cmd/podman/containers/port.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/prune.go b/cmd/podman/containers/prune.go index 5a84f0717d..e0f71d2885 100644 --- a/cmd/podman/containers/prune.go +++ b/cmd/podman/containers/prune.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go index 33c63380d0..b4116cc241 100644 --- a/cmd/podman/containers/ps.go +++ b/cmd/podman/containers/ps.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/rename.go b/cmd/podman/containers/rename.go index 03425b8a76..c91b38b360 100644 --- a/cmd/podman/containers/rename.go +++ b/cmd/podman/containers/rename.go @@ -3,10 +3,10 @@ package containers import ( "errors" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go index e2045ca527..9471fb83c1 100644 --- a/cmd/podman/containers/restart.go +++ b/cmd/podman/containers/restart.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go index c50e9a331a..5e53a5cdd0 100644 --- a/cmd/podman/containers/restore.go +++ b/cmd/podman/containers/restore.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go index c2d51c5fbe..5747008d3f 100644 --- a/cmd/podman/containers/rm.go +++ b/cmd/podman/containers/rm.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index 3b8c2a3b06..c13c65e4be 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -6,14 +6,14 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutil" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" diff --git a/cmd/podman/containers/runlabel.go b/cmd/podman/containers/runlabel.go index 7d114e14fe..51f7c8585f 100644 --- a/cmd/podman/containers/runlabel.go +++ b/cmd/podman/containers/runlabel.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index 5485613c54..3e0e60cde5 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index ba62b159fb..ec20ee3df5 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -6,12 +6,12 @@ import ( "os" "strconv" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - putils "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + putils "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go index 0ac689269a..34058a1d30 100644 --- a/cmd/podman/containers/stop.go +++ b/cmd/podman/containers/stop.go @@ -7,11 +7,11 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/containers/top.go b/cmd/podman/containers/top.go index 963243aaf7..90300abb4c 100644 --- a/cmd/podman/containers/top.go +++ b/cmd/podman/containers/top.go @@ -7,11 +7,11 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/pkg/report" diff --git a/cmd/podman/containers/unmount.go b/cmd/podman/containers/unmount.go index 1616ab4c07..f1dd16a4c5 100644 --- a/cmd/podman/containers/unmount.go +++ b/cmd/podman/containers/unmount.go @@ -3,11 +3,11 @@ package containers import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go index 3b7acdab53..382ab48591 100644 --- a/cmd/podman/containers/unpause.go +++ b/cmd/podman/containers/unpause.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/containers/update.go b/cmd/podman/containers/update.go index 1385f241ba..abcb272bfe 100644 --- a/cmd/podman/containers/update.go +++ b/cmd/podman/containers/update.go @@ -5,14 +5,14 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go index bc7d57bc07..2ff86eea40 100644 --- a/cmd/podman/containers/wait.go +++ b/cmd/podman/containers/wait.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index 7bc065665f..df94459d05 100644 --- a/cmd/podman/diff.go +++ b/cmd/podman/diff.go @@ -1,12 +1,12 @@ package main import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/diff" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/diff" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/diff/diff.go b/cmd/podman/diff/diff.go index b01d8bf676..53823dedfe 100644 --- a/cmd/podman/diff/diff.go +++ b/cmd/podman/diff/diff.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" "go.podman.io/storage/pkg/archive" diff --git a/cmd/podman/farm/build.go b/cmd/podman/farm/build.go index 488672a322..cfe317b84a 100644 --- a/cmd/podman/farm/build.go +++ b/cmd/podman/farm/build.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/farm" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/farm" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/farm/create.go b/cmd/podman/farm/create.go index 7fc23892b0..76400793cd 100644 --- a/cmd/podman/farm/create.go +++ b/cmd/podman/farm/create.go @@ -4,8 +4,8 @@ import ( "fmt" "slices" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" diff --git a/cmd/podman/farm/farm.go b/cmd/podman/farm/farm.go index c3b40d4757..cd773f0db5 100644 --- a/cmd/podman/farm/farm.go +++ b/cmd/podman/farm/farm.go @@ -1,8 +1,8 @@ package farm import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/farm/list.go b/cmd/podman/farm/list.go index 3ca01f4119..b736c6a0ed 100644 --- a/cmd/podman/farm/list.go +++ b/cmd/podman/farm/list.go @@ -5,9 +5,9 @@ import ( "os" "sort" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" diff --git a/cmd/podman/farm/remove.go b/cmd/podman/farm/remove.go index 79d1cacf5b..4573d146e6 100644 --- a/cmd/podman/farm/remove.go +++ b/cmd/podman/farm/remove.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" diff --git a/cmd/podman/farm/update.go b/cmd/podman/farm/update.go index a26edf26cb..e7fd3374c0 100644 --- a/cmd/podman/farm/update.go +++ b/cmd/podman/farm/update.go @@ -5,9 +5,9 @@ import ( "fmt" "slices" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" diff --git a/cmd/podman/generate/generate.go b/cmd/podman/generate/generate.go index dbfc7a3799..d4b86fde7b 100644 --- a/cmd/podman/generate/generate.go +++ b/cmd/podman/generate/generate.go @@ -1,8 +1,8 @@ package generate import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/generate/spec.go b/cmd/podman/generate/spec.go index 6e90759f73..0dad5c6510 100644 --- a/cmd/podman/generate/spec.go +++ b/cmd/podman/generate/spec.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go index 053bf35d97..51d7b4aa89 100644 --- a/cmd/podman/generate/systemd.go +++ b/cmd/podman/generate/systemd.go @@ -7,12 +7,12 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" - envLib "github.com/containers/podman/v5/pkg/env" - systemDefine "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" + envLib "github.com/containers/podman/v6/pkg/env" + systemDefine "github.com/containers/podman/v6/pkg/systemd/define" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/healthcheck/healthcheck.go b/cmd/podman/healthcheck/healthcheck.go index 07a42f2d08..9b3c904693 100644 --- a/cmd/podman/healthcheck/healthcheck.go +++ b/cmd/podman/healthcheck/healthcheck.go @@ -1,8 +1,8 @@ package healthcheck import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/healthcheck/run.go b/cmd/podman/healthcheck/run.go index 32e1af095f..eee68b69f4 100644 --- a/cmd/podman/healthcheck/run.go +++ b/cmd/podman/healthcheck/run.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 711d422127..d4387cbf48 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -6,9 +6,9 @@ import ( "os/exec" buildahCLI "github.com/containers/buildah/pkg/cli" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/buildx.go b/cmd/podman/images/buildx.go index 37091ce5e8..34ab24ebb5 100644 --- a/cmd/podman/images/buildx.go +++ b/cmd/podman/images/buildx.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/buildx_inspect.go b/cmd/podman/images/buildx_inspect.go index fe834b2298..44d4664eab 100644 --- a/cmd/podman/images/buildx_inspect.go +++ b/cmd/podman/images/buildx_inspect.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go index 801de179cb..4423bfc785 100644 --- a/cmd/podman/images/diff.go +++ b/cmd/podman/images/diff.go @@ -1,11 +1,11 @@ package images import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/diff" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/diff" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/images/exists.go b/cmd/podman/images/exists.go index 0e9657ce68..924c7ffecd 100644 --- a/cmd/podman/images/exists.go +++ b/cmd/podman/images/exists.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go index abdad37ea2..9e697de81c 100644 --- a/cmd/podman/images/history.go +++ b/cmd/podman/images/history.go @@ -5,10 +5,10 @@ import ( "os" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go index 2f65ad19f4..4fd9c64d35 100644 --- a/cmd/podman/images/image.go +++ b/cmd/podman/images/image.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go index e7422f7a8f..8d46c50259 100644 --- a/cmd/podman/images/import.go +++ b/cmd/podman/images/import.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go index 2460b4afc9..5da011495c 100644 --- a/cmd/podman/images/inspect.go +++ b/cmd/podman/images/inspect.go @@ -1,11 +1,11 @@ package images import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/inspect" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - inspectTypes "github.com/containers/podman/v5/pkg/inspect" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/inspect" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + inspectTypes "github.com/containers/podman/v6/pkg/inspect" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index d7f429e091..8bfeff054e 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -10,10 +10,10 @@ import ( "time" "unicode" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index d4976c5f4e..959ad7cb97 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/download" diff --git a/cmd/podman/images/mount.go b/cmd/podman/images/mount.go index b4f6fc7274..6089cda0e3 100644 --- a/cmd/podman/images/mount.go +++ b/cmd/podman/images/mount.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" ) diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go index 69c929a5ca..c51fe7913b 100644 --- a/cmd/podman/images/prune.go +++ b/cmd/podman/images/prune.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index bbd6b7afb4..4f91fd555d 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/containers/buildah/pkg/cli" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index 953ee28f47..030f8b26a4 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/buildah/pkg/cli" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/images/rm.go b/cmd/podman/images/rm.go index 596dbb303a..42ebd17679 100644 --- a/cmd/podman/images/rm.go +++ b/cmd/podman/images/rm.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go index 7239515837..6aede1a5e6 100644 --- a/cmd/podman/images/save.go +++ b/cmd/podman/images/save.go @@ -8,11 +8,11 @@ import ( "slices" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "golang.org/x/term" diff --git a/cmd/podman/images/scp.go b/cmd/podman/images/scp.go index 6c103044c6..6a6b8dd03e 100644 --- a/cmd/podman/images/scp.go +++ b/cmd/podman/images/scp.go @@ -4,9 +4,9 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/ssh" ) diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index c953311af7..fd6919f6e5 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go index 3cb229fc19..0c76a98320 100644 --- a/cmd/podman/images/sign.go +++ b/cmd/podman/images/sign.go @@ -3,9 +3,9 @@ package images import ( "errors" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/images/tag.go b/cmd/podman/images/tag.go index 5a76b850e2..5934424412 100644 --- a/cmd/podman/images/tag.go +++ b/cmd/podman/images/tag.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go index db73893caa..bec78c296b 100644 --- a/cmd/podman/images/tree.go +++ b/cmd/podman/images/tree.go @@ -3,9 +3,9 @@ package images import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust.go b/cmd/podman/images/trust.go index 6092c7f05a..20c1e415c9 100644 --- a/cmd/podman/images/trust.go +++ b/cmd/podman/images/trust.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust_set.go b/cmd/podman/images/trust_set.go index b14b04abd8..ec2ccf2a18 100644 --- a/cmd/podman/images/trust_set.go +++ b/cmd/podman/images/trust_set.go @@ -6,9 +6,9 @@ import ( "regexp" "slices" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/images/trust_show.go b/cmd/podman/images/trust_show.go index d09e4305ec..a850244f57 100644 --- a/cmd/podman/images/trust_show.go +++ b/cmd/podman/images/trust_show.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" ) diff --git a/cmd/podman/images/unmount.go b/cmd/podman/images/unmount.go index 796d87915d..e1feafe14e 100644 --- a/cmd/podman/images/unmount.go +++ b/cmd/podman/images/unmount.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/images/untag.go b/cmd/podman/images/untag.go index 014db1417e..af8855fdc3 100644 --- a/cmd/podman/images/untag.go +++ b/cmd/podman/images/untag.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/version.go b/cmd/podman/images/version.go index 1389395008..8ab88812bb 100644 --- a/cmd/podman/images/version.go +++ b/cmd/podman/images/version.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/containers/buildah/define" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go index 425327dba0..ce0b5b0496 100644 --- a/cmd/podman/inspect.go +++ b/cmd/podman/inspect.go @@ -1,10 +1,10 @@ package main import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/inspect" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/inspect" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go index e9f397e5ba..86ff15363f 100644 --- a/cmd/podman/inspect/inspect.go +++ b/cmd/podman/inspect/inspect.go @@ -8,11 +8,11 @@ import ( "regexp" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" ) diff --git a/cmd/podman/kube/apply.go b/cmd/podman/kube/apply.go index 0382960500..9951369ed5 100644 --- a/cmd/podman/kube/apply.go +++ b/cmd/podman/kube/apply.go @@ -6,10 +6,10 @@ import ( "io" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/kube/down.go b/cmd/podman/kube/down.go index 3c3ac701f2..5f03770eb4 100644 --- a/cmd/podman/kube/down.go +++ b/cmd/podman/kube/down.go @@ -1,9 +1,9 @@ package kube import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/kube/generate.go b/cmd/podman/kube/generate.go index 8998ce6d57..ab2e76016b 100644 --- a/cmd/podman/kube/generate.go +++ b/cmd/podman/kube/generate.go @@ -5,11 +5,11 @@ import ( "io" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/generate" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/generate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/storage/pkg/fileutils" diff --git a/cmd/podman/kube/kube.go b/cmd/podman/kube/kube.go index 9dd9dec1e1..ede6f789d8 100644 --- a/cmd/podman/kube/kube.go +++ b/cmd/podman/kube/kube.go @@ -1,8 +1,8 @@ package kube import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/kube/play.go b/cmd/podman/kube/play.go index 04b0cd01e4..107d66f519 100644 --- a/cmd/podman/kube/play.go +++ b/cmd/podman/kube/play.go @@ -13,16 +13,16 @@ import ( "syscall" buildahParse "github.com/containers/buildah/pkg/parse" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/shutdown" - "github.com/containers/podman/v5/pkg/annotations" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/shutdown" + "github.com/containers/podman/v6/pkg/annotations" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/login.go b/cmd/podman/login.go index fd30c2d322..4ae3e27b2f 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index d6c1d9ddb0..25db61dfb6 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/machine/client9p.go b/cmd/podman/machine/client9p.go index 18b4d029a2..0d7bddd0a7 100644 --- a/cmd/podman/machine/client9p.go +++ b/cmd/podman/machine/client9p.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/mdlayher/vsock" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/machine/cp.go b/cmd/podman/machine/cp.go index 3437b87c31..7d730ad13b 100644 --- a/cmd/podman/machine/cp.go +++ b/cmd/podman/machine/cp.go @@ -9,14 +9,14 @@ import ( "os/exec" "strconv" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/copy" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/copy" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/specgen" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/info.go b/cmd/podman/machine/info.go index 85b5c7c51f..237e9b2c9c 100644 --- a/cmd/podman/machine/info.go +++ b/cmd/podman/machine/info.go @@ -7,14 +7,14 @@ import ( "os" "runtime" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - machineDefine "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + machineDefine "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index 4bc484f241..fd0f980494 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -7,12 +7,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/registry" - ldefine "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/shim" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/cmd/podman/registry" + ldefine "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/shim" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/shirou/gopsutil/v4/mem" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go index 4b212b46ba..403ec17384 100644 --- a/cmd/podman/machine/inspect.go +++ b/cmd/podman/machine/inspect.go @@ -5,12 +5,12 @@ package machine import ( "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" ) diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go index 67817c1bf5..f33bf942fc 100644 --- a/cmd/podman/machine/list.go +++ b/cmd/podman/machine/list.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/machine" - provider2 "github.com/containers/podman/v5/pkg/machine/provider" - "github.com/containers/podman/v5/pkg/machine/shim" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/machine" + provider2 "github.com/containers/podman/v6/pkg/machine/provider" + "github.com/containers/podman/v6/pkg/machine/shim" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/machine/machine.go b/cmd/podman/machine/machine.go index c71d33f424..48ed1ede87 100644 --- a/cmd/podman/machine/machine.go +++ b/cmd/podman/machine/machine.go @@ -12,13 +12,13 @@ import ( "sync" "time" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/machine/env" - provider2 "github.com/containers/podman/v5/pkg/machine/provider" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/machine/env" + provider2 "github.com/containers/podman/v6/pkg/machine/provider" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/machine_unix.go b/cmd/podman/machine/machine_unix.go index 051f1517e1..7af406a2f4 100644 --- a/cmd/podman/machine/machine_unix.go +++ b/cmd/podman/machine/machine_unix.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/os.go b/cmd/podman/machine/os.go index 71477e030d..6521e8829e 100644 --- a/cmd/podman/machine/os.go +++ b/cmd/podman/machine/os.go @@ -3,8 +3,8 @@ package machine import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/os/apply.go b/cmd/podman/machine/os/apply.go index 6eb880ad89..0e23c2b83f 100644 --- a/cmd/podman/machine/os/apply.go +++ b/cmd/podman/machine/os/apply.go @@ -3,12 +3,12 @@ package os import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/machine" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/machine/os" - provider2 "github.com/containers/podman/v5/pkg/machine/provider" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/machine" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/machine/os" + provider2 "github.com/containers/podman/v6/pkg/machine/provider" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/os/manager.go b/cmd/podman/machine/os/manager.go index 80f30f9c17..9f6ad57fed 100644 --- a/cmd/podman/machine/os/manager.go +++ b/cmd/podman/machine/os/manager.go @@ -8,11 +8,11 @@ import ( "os" "strings" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - pkgOS "github.com/containers/podman/v5/pkg/machine/os" - "github.com/containers/podman/v5/pkg/machine/provider" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + pkgOS "github.com/containers/podman/v6/pkg/machine/os" + "github.com/containers/podman/v6/pkg/machine/provider" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" machineconfig "go.podman.io/common/pkg/machine" ) diff --git a/cmd/podman/machine/reset.go b/cmd/podman/machine/reset.go index a1d6e7851d..5a598e0e8b 100644 --- a/cmd/podman/machine/reset.go +++ b/cmd/podman/machine/reset.go @@ -9,11 +9,11 @@ import ( "strings" "text/tabwriter" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/machine" - provider2 "github.com/containers/podman/v5/pkg/machine/provider" - "github.com/containers/podman/v5/pkg/machine/shim" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/machine" + provider2 "github.com/containers/podman/v6/pkg/machine/provider" + "github.com/containers/podman/v6/pkg/machine/shim" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/machine/rm.go b/cmd/podman/machine/rm.go index 5b76e1c19c..a243da534b 100644 --- a/cmd/podman/machine/rm.go +++ b/cmd/podman/machine/rm.go @@ -3,12 +3,12 @@ package machine import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/shim" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/shim" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/server9p.go b/cmd/podman/machine/server9p.go index 025145ce0f..57bd110d33 100644 --- a/cmd/podman/machine/server9p.go +++ b/cmd/podman/machine/server9p.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/fileserver" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/fileserver" psutil "github.com/shirou/gopsutil/v4/process" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/machine/set.go b/cmd/podman/machine/set.go index a49abe1953..8211a343a5 100644 --- a/cmd/podman/machine/set.go +++ b/cmd/podman/machine/set.go @@ -3,11 +3,11 @@ package machine import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/shim" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/shim" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/strongunits" diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go index 1f1b6e6d6a..909d39aa54 100644 --- a/cmd/podman/machine/ssh.go +++ b/cmd/podman/machine/ssh.go @@ -5,13 +5,13 @@ package machine import ( "fmt" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/machine/start.go b/cmd/podman/machine/start.go index 6a48eef14c..f7c88dc880 100644 --- a/cmd/podman/machine/start.go +++ b/cmd/podman/machine/start.go @@ -5,12 +5,12 @@ package machine import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/shim" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/shim" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/stop.go b/cmd/podman/machine/stop.go index 3950a4de25..87db79df8c 100644 --- a/cmd/podman/machine/stop.go +++ b/cmd/podman/machine/stop.go @@ -5,11 +5,11 @@ package machine import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/shim" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/shim" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/spf13/cobra" ) diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 21585116d4..da010076e4 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -7,29 +7,29 @@ import ( "strconv" "strings" - _ "github.com/containers/podman/v5/cmd/podman/artifact" - _ "github.com/containers/podman/v5/cmd/podman/completion" - _ "github.com/containers/podman/v5/cmd/podman/farm" - _ "github.com/containers/podman/v5/cmd/podman/generate" - _ "github.com/containers/podman/v5/cmd/podman/healthcheck" - _ "github.com/containers/podman/v5/cmd/podman/images" - _ "github.com/containers/podman/v5/cmd/podman/kube" - _ "github.com/containers/podman/v5/cmd/podman/machine" - _ "github.com/containers/podman/v5/cmd/podman/machine/os" - _ "github.com/containers/podman/v5/cmd/podman/manifest" - _ "github.com/containers/podman/v5/cmd/podman/networks" - _ "github.com/containers/podman/v5/cmd/podman/pods" - _ "github.com/containers/podman/v5/cmd/podman/quadlet" - "github.com/containers/podman/v5/cmd/podman/registry" - _ "github.com/containers/podman/v5/cmd/podman/secrets" - _ "github.com/containers/podman/v5/cmd/podman/system" - _ "github.com/containers/podman/v5/cmd/podman/system/connection" - "github.com/containers/podman/v5/cmd/podman/validate" - _ "github.com/containers/podman/v5/cmd/podman/volumes" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/logiface" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/terminal" + _ "github.com/containers/podman/v6/cmd/podman/artifact" + _ "github.com/containers/podman/v6/cmd/podman/completion" + _ "github.com/containers/podman/v6/cmd/podman/farm" + _ "github.com/containers/podman/v6/cmd/podman/generate" + _ "github.com/containers/podman/v6/cmd/podman/healthcheck" + _ "github.com/containers/podman/v6/cmd/podman/images" + _ "github.com/containers/podman/v6/cmd/podman/kube" + _ "github.com/containers/podman/v6/cmd/podman/machine" + _ "github.com/containers/podman/v6/cmd/podman/machine/os" + _ "github.com/containers/podman/v6/cmd/podman/manifest" + _ "github.com/containers/podman/v6/cmd/podman/networks" + _ "github.com/containers/podman/v6/cmd/podman/pods" + _ "github.com/containers/podman/v6/cmd/podman/quadlet" + "github.com/containers/podman/v6/cmd/podman/registry" + _ "github.com/containers/podman/v6/cmd/podman/secrets" + _ "github.com/containers/podman/v6/cmd/podman/system" + _ "github.com/containers/podman/v6/cmd/podman/system/connection" + "github.com/containers/podman/v6/cmd/podman/validate" + _ "github.com/containers/podman/v6/cmd/podman/volumes" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/logiface" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/terminal" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/storage/pkg/reexec" diff --git a/cmd/podman/manifest/add.go b/cmd/podman/manifest/add.go index 571b26c465..b0f637dfb6 100644 --- a/cmd/podman/manifest/add.go +++ b/cmd/podman/manifest/add.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go index b89a5b1dc2..962401f963 100644 --- a/cmd/podman/manifest/annotate.go +++ b/cmd/podman/manifest/annotate.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/manifest/create.go b/cmd/podman/manifest/create.go index 2ed0c8f4e7..332f0bc245 100644 --- a/cmd/podman/manifest/create.go +++ b/cmd/podman/manifest/create.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" diff --git a/cmd/podman/manifest/exists.go b/cmd/podman/manifest/exists.go index 1a28aad82c..dfe15537c7 100644 --- a/cmd/podman/manifest/exists.go +++ b/cmd/podman/manifest/exists.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/inspect.go b/cmd/podman/manifest/inspect.go index c0931924f4..067fa6cf65 100644 --- a/cmd/podman/manifest/inspect.go +++ b/cmd/podman/manifest/inspect.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/manifest/manifest.go b/cmd/podman/manifest/manifest.go index 8f1011a319..25e55f81d1 100644 --- a/cmd/podman/manifest/manifest.go +++ b/cmd/podman/manifest/manifest.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/push.go b/cmd/podman/manifest/push.go index 493274e9a8..5ac479f91d 100644 --- a/cmd/podman/manifest/push.go +++ b/cmd/podman/manifest/push.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/manifest/remove.go b/cmd/podman/manifest/remove.go index 3a021cc43b..01fe077a36 100644 --- a/cmd/podman/manifest/remove.go +++ b/cmd/podman/manifest/remove.go @@ -3,8 +3,8 @@ package manifest import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/rm.go b/cmd/podman/manifest/rm.go index 6427f73103..475ddecf3a 100644 --- a/cmd/podman/manifest/rm.go +++ b/cmd/podman/manifest/rm.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/connect.go b/cmd/podman/networks/connect.go index b533f4063e..9cbd8f8588 100644 --- a/cmd/podman/networks/connect.go +++ b/cmd/podman/networks/connect.go @@ -3,9 +3,9 @@ package network import ( "net" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go index b3271722cf..e2d961658f 100644 --- a/cmd/podman/networks/create.go +++ b/cmd/podman/networks/create.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/libnetwork/types" diff --git a/cmd/podman/networks/disconnect.go b/cmd/podman/networks/disconnect.go index e8b6e4bfe1..0aaa34b701 100644 --- a/cmd/podman/networks/disconnect.go +++ b/cmd/podman/networks/disconnect.go @@ -1,9 +1,9 @@ package network import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/exists.go b/cmd/podman/networks/exists.go index 6071cb2b93..f6a55d1987 100644 --- a/cmd/podman/networks/exists.go +++ b/cmd/podman/networks/exists.go @@ -1,8 +1,8 @@ package network import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go index f2962fdeca..871ae1f8e2 100644 --- a/cmd/podman/networks/inspect.go +++ b/cmd/podman/networks/inspect.go @@ -1,10 +1,10 @@ package network import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/inspect" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/inspect" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go index 033b2db3e2..d9e4c8620a 100644 --- a/cmd/podman/networks/list.go +++ b/cmd/podman/networks/list.go @@ -6,11 +6,11 @@ import ( "sort" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/libnetwork/types" diff --git a/cmd/podman/networks/network.go b/cmd/podman/networks/network.go index 2329a9f20a..8fd8ddde34 100644 --- a/cmd/podman/networks/network.go +++ b/cmd/podman/networks/network.go @@ -1,8 +1,8 @@ package network import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/prune.go b/cmd/podman/networks/prune.go index 5664be75d3..f4a7f6c958 100644 --- a/cmd/podman/networks/prune.go +++ b/cmd/podman/networks/prune.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/reload.go b/cmd/podman/networks/reload.go index 98e3b7a3a5..5f2216e394 100644 --- a/cmd/podman/networks/reload.go +++ b/cmd/podman/networks/reload.go @@ -3,11 +3,11 @@ package network import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/rm.go b/cmd/podman/networks/rm.go index 185873ef4b..fc98b011a6 100644 --- a/cmd/podman/networks/rm.go +++ b/cmd/podman/networks/rm.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/networks/update.go b/cmd/podman/networks/update.go index b19e066541..3d2e0bf8ce 100644 --- a/cmd/podman/networks/update.go +++ b/cmd/podman/networks/update.go @@ -3,9 +3,9 @@ package network import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/pods/clone.go b/cmd/podman/pods/clone.go index a87d40b315..df6d71254f 100644 --- a/cmd/podman/pods/clone.go +++ b/cmd/podman/pods/clone.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index 75d97019f0..24d9d5b301 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -9,16 +9,16 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/containers" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/containers" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/pods/exists.go b/cmd/podman/pods/exists.go index b1f30d8322..f35fb51bca 100644 --- a/cmd/podman/pods/exists.go +++ b/cmd/podman/pods/exists.go @@ -3,8 +3,8 @@ package pods import ( "context" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go index 31c2e67faf..4e44eae842 100644 --- a/cmd/podman/pods/inspect.go +++ b/cmd/podman/pods/inspect.go @@ -1,11 +1,11 @@ package pods import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/inspect" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/inspect" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/kill.go b/cmd/podman/pods/kill.go index 5f389b1074..cc86f0e269 100644 --- a/cmd/podman/pods/kill.go +++ b/cmd/podman/pods/kill.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/logs.go b/cmd/podman/pods/logs.go index aa0203e402..69fc67998d 100644 --- a/cmd/podman/pods/logs.go +++ b/cmd/podman/pods/logs.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/pods/pause.go b/cmd/podman/pods/pause.go index bca150cac5..24a3c7b7fe 100644 --- a/cmd/podman/pods/pause.go +++ b/cmd/podman/pods/pause.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/pod.go b/cmd/podman/pods/pod.go index 47b520006f..9028867663 100644 --- a/cmd/podman/pods/pod.go +++ b/cmd/podman/pods/pod.go @@ -1,8 +1,8 @@ package pods import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go index 5069334b2e..d3c6c34ff6 100644 --- a/cmd/podman/pods/prune.go +++ b/cmd/podman/pods/prune.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index c0baa92352..a566fb1aa1 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/pods/restart.go b/cmd/podman/pods/restart.go index 0c823abf14..415f0ac58b 100644 --- a/cmd/podman/pods/restart.go +++ b/cmd/podman/pods/restart.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go index 690f3a6c3b..256f4ff894 100644 --- a/cmd/podman/pods/rm.go +++ b/cmd/podman/pods/rm.go @@ -7,13 +7,13 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgenutil" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/pods/start.go b/cmd/podman/pods/start.go index 85814fdc45..00bdbb241e 100644 --- a/cmd/podman/pods/start.go +++ b/cmd/podman/pods/start.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgenutil" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go index b66285c627..6de991000a 100644 --- a/cmd/podman/pods/stats.go +++ b/cmd/podman/pods/stats.go @@ -6,10 +6,10 @@ import ( "os" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" ) diff --git a/cmd/podman/pods/stop.go b/cmd/podman/pods/stop.go index f6107e479d..499b4fae76 100644 --- a/cmd/podman/pods/stop.go +++ b/cmd/podman/pods/stop.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgenutil" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/pods/top.go b/cmd/podman/pods/top.go index f24f5d84ee..d9a723ed83 100644 --- a/cmd/podman/pods/top.go +++ b/cmd/podman/pods/top.go @@ -7,11 +7,11 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" ) diff --git a/cmd/podman/pods/unpause.go b/cmd/podman/pods/unpause.go index 2d7598847d..d19fcc757c 100644 --- a/cmd/podman/pods/unpause.go +++ b/cmd/podman/pods/unpause.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/quadlet/install.go b/cmd/podman/quadlet/install.go index cf46d1e853..3abb15996b 100644 --- a/cmd/podman/quadlet/install.go +++ b/cmd/podman/quadlet/install.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/quadlet/list.go b/cmd/podman/quadlet/list.go index 843739de0a..0bb9858599 100644 --- a/cmd/podman/quadlet/list.go +++ b/cmd/podman/quadlet/list.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" diff --git a/cmd/podman/quadlet/print.go b/cmd/podman/quadlet/print.go index 541c99a412..aad5d73497 100644 --- a/cmd/podman/quadlet/print.go +++ b/cmd/podman/quadlet/print.go @@ -3,8 +3,8 @@ package quadlet import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/quadlet/quadlet.go b/cmd/podman/quadlet/quadlet.go index 8fa4e2fcc0..d05b9c4fb9 100644 --- a/cmd/podman/quadlet/quadlet.go +++ b/cmd/podman/quadlet/quadlet.go @@ -1,9 +1,9 @@ package quadlet import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/logiface" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/logiface" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/quadlet/remove.go b/cmd/podman/quadlet/remove.go index 89a62ef901..832f3e58c4 100644 --- a/cmd/podman/quadlet/remove.go +++ b/cmd/podman/quadlet/remove.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index f7fc808227..97925c6a0f 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -7,9 +7,9 @@ import ( "runtime" "sync" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/pkg/config" diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go index 01a514d92f..e1f9ad311e 100644 --- a/cmd/podman/registry/registry.go +++ b/cmd/podman/registry/registry.go @@ -4,10 +4,10 @@ import ( "context" "path/filepath" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index 2ff53a038d..8b4705b2e1 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/pflag" ) diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 700b80939e..303d163043 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -12,16 +12,16 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/shutdown" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/checkpoint/crutils" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/parallel" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/shutdown" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/checkpoint/crutils" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/parallel" + "github.com/containers/podman/v6/version" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/root_test.go b/cmd/podman/root_test.go index af89b90fbd..018c6c122c 100644 --- a/cmd/podman/root_test.go +++ b/cmd/podman/root_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) func TestFormatError(t *testing.T) { diff --git a/cmd/podman/secrets/create.go b/cmd/podman/secrets/create.go index 9f87054e45..97a2d8f955 100644 --- a/cmd/podman/secrets/create.go +++ b/cmd/podman/secrets/create.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/secrets/exists.go b/cmd/podman/secrets/exists.go index c63a2d7fbc..06357409c0 100644 --- a/cmd/podman/secrets/exists.go +++ b/cmd/podman/secrets/exists.go @@ -1,8 +1,8 @@ package secrets import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/inspect.go b/cmd/podman/secrets/inspect.go index ac8fbde251..6507815444 100644 --- a/cmd/podman/secrets/inspect.go +++ b/cmd/podman/secrets/inspect.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" ) diff --git a/cmd/podman/secrets/list.go b/cmd/podman/secrets/list.go index ffb3947615..072fb89ebb 100644 --- a/cmd/podman/secrets/list.go +++ b/cmd/podman/secrets/list.go @@ -6,11 +6,11 @@ import ( "os" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/secrets/rm.go b/cmd/podman/secrets/rm.go index f7f6bc9eb8..f3648ec91b 100644 --- a/cmd/podman/secrets/rm.go +++ b/cmd/podman/secrets/rm.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/secret.go b/cmd/podman/secrets/secret.go index 025e2307c2..e9703aeaa9 100644 --- a/cmd/podman/secrets/secret.go +++ b/cmd/podman/secrets/secret.go @@ -1,8 +1,8 @@ package secrets import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/shell_completion_test.go b/cmd/podman/shell_completion_test.go index df4c251159..dcb0ff2117 100644 --- a/cmd/podman/shell_completion_test.go +++ b/cmd/podman/shell_completion_test.go @@ -6,7 +6,7 @@ function set. (except boolean, hidden and deprecated flags) Shell completion functions are defined in: - - "github.com/containers/podman/v5/cmd/podman/common/completion.go" + - "github.com/containers/podman/v6/cmd/podman/common/completion.go" - "go.podman.io/common/pkg/completion" and are called Autocomplete... diff --git a/cmd/podman/syslog_common.go b/cmd/podman/syslog_common.go index a5782be638..35ec07ce71 100644 --- a/cmd/podman/syslog_common.go +++ b/cmd/podman/syslog_common.go @@ -5,7 +5,7 @@ package main import ( "log/syslog" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/sirupsen/logrus" logrusSyslog "github.com/sirupsen/logrus/hooks/syslog" ) diff --git a/cmd/podman/syslog_unsupported.go b/cmd/podman/syslog_unsupported.go index 602c480b68..f65d624b3f 100644 --- a/cmd/podman/syslog_unsupported.go +++ b/cmd/podman/syslog_unsupported.go @@ -7,7 +7,7 @@ import ( "os" "runtime" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/registry" ) func syslogHook() { diff --git a/cmd/podman/system/check.go b/cmd/podman/system/check.go index bad4a7d87e..53180e63fb 100644 --- a/cmd/podman/system/check.go +++ b/cmd/podman/system/check.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities/types" multierror "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/system/connection.go b/cmd/podman/system/connection.go index a493b14976..06e703aafd 100644 --- a/cmd/podman/system/connection.go +++ b/cmd/podman/system/connection.go @@ -1,8 +1,8 @@ package system import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go index 40ecd8b689..61c5e87f35 100644 --- a/cmd/podman/system/connection/add.go +++ b/cmd/podman/system/connection/add.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/system" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/system" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/system/connection/default.go b/cmd/podman/system/connection/default.go index 7ec846d6f3..b38e991782 100644 --- a/cmd/podman/system/connection/default.go +++ b/cmd/podman/system/connection/default.go @@ -3,9 +3,9 @@ package connection import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/system" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/system" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" ) diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index e82438958a..e75f2eb2e8 100644 --- a/cmd/podman/system/connection/list.go +++ b/cmd/podman/system/connection/list.go @@ -6,10 +6,10 @@ import ( "slices" "sort" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/system" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/system" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go index 112746e6f3..b7040e969e 100644 --- a/cmd/podman/system/connection/remove.go +++ b/cmd/podman/system/connection/remove.go @@ -3,9 +3,9 @@ package connection import ( "slices" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/system" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/system" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" ) diff --git a/cmd/podman/system/connection/rename.go b/cmd/podman/system/connection/rename.go index 6473ef8658..680b7f4468 100644 --- a/cmd/podman/system/connection/rename.go +++ b/cmd/podman/system/connection/rename.go @@ -3,9 +3,9 @@ package connection import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/system" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/system" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" ) diff --git a/cmd/podman/system/context.go b/cmd/podman/system/context.go index b58ab3efa2..ac0d60dac5 100644 --- a/cmd/podman/system/context.go +++ b/cmd/podman/system/context.go @@ -1,8 +1,8 @@ package system import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index 5a609966b6..fcb7615297 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/system/dial_stdio.go b/cmd/podman/system/dial_stdio.go index 1329c7b232..d31a4f4a1b 100644 --- a/cmd/podman/system/dial_stdio.go +++ b/cmd/podman/system/dial_stdio.go @@ -8,9 +8,9 @@ import ( "errors" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/bindings" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go index a50c2a8e6d..dfed473d71 100644 --- a/cmd/podman/system/events.go +++ b/cmd/podman/system/events.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go index a8a0ce5dbe..0f756558a6 100644 --- a/cmd/podman/system/info.go +++ b/cmd/podman/system/info.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/libpod/define" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" diff --git a/cmd/podman/system/locks.go b/cmd/podman/system/locks.go index f722bd9acd..3a99299f2c 100644 --- a/cmd/podman/system/locks.go +++ b/cmd/podman/system/locks.go @@ -3,8 +3,8 @@ package system import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go index b0e7866944..edcce98c5c 100644 --- a/cmd/podman/system/migrate.go +++ b/cmd/podman/system/migrate.go @@ -3,9 +3,9 @@ package system import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go index 561fb5be32..f5d44eb259 100644 --- a/cmd/podman/system/prune.go +++ b/cmd/podman/system/prune.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go index b86fc84edf..d244aa9cfd 100644 --- a/cmd/podman/system/renumber.go +++ b/cmd/podman/system/renumber.go @@ -3,8 +3,8 @@ package system import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index 6cadfe08ee..c302c0c6f3 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/containers/buildah/pkg/volumes" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/system/reset_machine.go b/cmd/podman/system/reset_machine.go index 6152b75a96..6d2c313fe1 100644 --- a/cmd/podman/system/reset_machine.go +++ b/cmd/podman/system/reset_machine.go @@ -3,13 +3,13 @@ package system import ( - "github.com/containers/podman/v5/pkg/machine/connection" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - p "github.com/containers/podman/v5/pkg/machine/provider" - "github.com/containers/podman/v5/pkg/machine/shim" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine/connection" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + p "github.com/containers/podman/v6/pkg/machine/provider" + "github.com/containers/podman/v6/pkg/machine/shim" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" ) diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index 7bad67a0c0..27a2382a87 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -10,12 +10,12 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/systemd" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/systemd" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go index c8b1cd5531..07f622c0ac 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -10,10 +10,10 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/cmd/podman/registry" - api "github.com/containers/podman/v5/pkg/api/server" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra" + "github.com/containers/podman/v6/cmd/podman/registry" + api "github.com/containers/podman/v6/pkg/api/server" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra" "github.com/coreos/go-systemd/v22/activation" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/cmd/podman/system/service_abi_linux.go b/cmd/podman/system/service_abi_linux.go index 326f57de73..5532143f12 100644 --- a/cmd/podman/system/service_abi_linux.go +++ b/cmd/podman/system/service_abi_linux.go @@ -3,7 +3,7 @@ package system import ( - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/pkg/rootless" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/servicereaper" diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go index 6347b518e3..ebfbec2e4b 100644 --- a/cmd/podman/system/system.go +++ b/cmd/podman/system/system.go @@ -1,8 +1,8 @@ package system import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/unshare.go b/cmd/podman/system/unshare.go index 7099704191..d282b01757 100644 --- a/cmd/podman/system/unshare.go +++ b/cmd/podman/system/unshare.go @@ -4,10 +4,10 @@ import ( "errors" "os" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index ea11c556ed..a03d48be94 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" diff --git a/cmd/podman/utils/error.go b/cmd/podman/utils/error.go index 345add2bc6..02aa5a1458 100644 --- a/cmd/podman/utils/error.go +++ b/cmd/podman/utils/error.go @@ -9,7 +9,7 @@ import ( "strings" buildahCLI "github.com/containers/buildah/pkg/cli" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/registry" ) type OutputErrors []error diff --git a/cmd/podman/utils/utils.go b/cmd/podman/utils/utils.go index 0b815ad6a8..a0c1366182 100644 --- a/cmd/podman/utils/utils.go +++ b/cmd/podman/utils/utils.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" ) // IsDir returns true if the specified path refers to a directory. diff --git a/cmd/podman/validate/args.go b/cmd/podman/validate/args.go index c1b108fd80..9a3c20731c 100644 --- a/cmd/podman/validate/args.go +++ b/cmd/podman/validate/args.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/validate/latest.go b/cmd/podman/validate/latest.go index f6f62ebace..9890bd245c 100644 --- a/cmd/podman/validate/latest.go +++ b/cmd/podman/validate/latest.go @@ -1,7 +1,7 @@ package validate import ( - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/create.go b/cmd/podman/volumes/create.go index 3ab129b628..ec7614ecd5 100644 --- a/cmd/podman/volumes/create.go +++ b/cmd/podman/volumes/create.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/volumes/exists.go b/cmd/podman/volumes/exists.go index 79c14331b6..42edaa7cef 100644 --- a/cmd/podman/volumes/exists.go +++ b/cmd/podman/volumes/exists.go @@ -1,8 +1,8 @@ package volumes import ( - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/export.go b/cmd/podman/volumes/export.go index bc00395d5d..774e860896 100644 --- a/cmd/podman/volumes/export.go +++ b/cmd/podman/volumes/export.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "golang.org/x/term" diff --git a/cmd/podman/volumes/import.go b/cmd/podman/volumes/import.go index 4a6a22f0a9..c776d50cca 100644 --- a/cmd/podman/volumes/import.go +++ b/cmd/podman/volumes/import.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/inspect.go b/cmd/podman/volumes/inspect.go index c2f01235e6..a91a69881d 100644 --- a/cmd/podman/volumes/inspect.go +++ b/cmd/podman/volumes/inspect.go @@ -3,11 +3,11 @@ package volumes import ( "errors" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/inspect" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/inspect" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index edbf51202c..cb2f9c2123 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" diff --git a/cmd/podman/volumes/mount.go b/cmd/podman/volumes/mount.go index 0df2c1c779..288822a6e3 100644 --- a/cmd/podman/volumes/mount.go +++ b/cmd/podman/volumes/mount.go @@ -3,9 +3,9 @@ package volumes import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/prune.go b/cmd/podman/volumes/prune.go index a1f0cecc0c..6cf388af4e 100644 --- a/cmd/podman/volumes/prune.go +++ b/cmd/podman/volumes/prune.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/volumes/reload.go b/cmd/podman/volumes/reload.go index cae82dfe36..8d0115d13d 100644 --- a/cmd/podman/volumes/reload.go +++ b/cmd/podman/volumes/reload.go @@ -3,9 +3,9 @@ package volumes import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/volumes/rm.go b/cmd/podman/volumes/rm.go index 80e84469e5..0b75eeeae0 100644 --- a/cmd/podman/volumes/rm.go +++ b/cmd/podman/volumes/rm.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/volumes/unmount.go b/cmd/podman/volumes/unmount.go index aef515ec55..595ac72fe0 100644 --- a/cmd/podman/volumes/unmount.go +++ b/cmd/podman/volumes/unmount.go @@ -3,9 +3,9 @@ package volumes import ( "fmt" - "github.com/containers/podman/v5/cmd/podman/common" - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v6/cmd/podman/common" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/utils" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/volume.go b/cmd/podman/volumes/volume.go index e42e2ac55e..6a2a35e5cc 100644 --- a/cmd/podman/volumes/volume.go +++ b/cmd/podman/volumes/volume.go @@ -1,8 +1,8 @@ package volumes import ( - "github.com/containers/podman/v5/cmd/podman/registry" - "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v6/cmd/podman/registry" + "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/quadlet/main.go b/cmd/quadlet/main.go index 6e4bf0f077..c8b63e22e5 100644 --- a/cmd/quadlet/main.go +++ b/cmd/quadlet/main.go @@ -11,10 +11,10 @@ import ( "strings" "unicode" - "github.com/containers/podman/v5/pkg/logiface" - "github.com/containers/podman/v5/pkg/systemd/parser" - "github.com/containers/podman/v5/pkg/systemd/quadlet" - "github.com/containers/podman/v5/version/rawversion" + "github.com/containers/podman/v6/pkg/logiface" + "github.com/containers/podman/v6/pkg/systemd/parser" + "github.com/containers/podman/v6/pkg/systemd/quadlet" + "github.com/containers/podman/v6/version/rawversion" ) // This commandline app is the systemd generator (system and user, diff --git a/go.mod b/go.mod index efb43b9b38..a749a200d2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/containers/podman/v5 +module github.com/containers/podman/v6 // Warning: if there is a "toolchain" directive anywhere in this file (and most of the // time there shouldn't be), its version must be an exact match to the "go" directive. diff --git a/hack/podman-registry-go/registry.go b/hack/podman-registry-go/registry.go index 912fa2745a..748f9088d7 100644 --- a/hack/podman-registry-go/registry.go +++ b/hack/podman-registry-go/registry.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" ) diff --git a/internal/domain/infra/abi/testing.go b/internal/domain/infra/abi/testing.go index a3fcd8711c..3087c8967d 100644 --- a/internal/domain/infra/abi/testing.go +++ b/internal/domain/infra/abi/testing.go @@ -9,8 +9,8 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/internal/domain/entities" - "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v6/internal/domain/entities" + "github.com/containers/podman/v6/libpod" "go.podman.io/image/v5/manifest" "go.podman.io/storage" graphdriver "go.podman.io/storage/drivers" diff --git a/internal/domain/infra/abi/testing_test.go b/internal/domain/infra/abi/testing_test.go index dbad5489d6..267ec00ab5 100644 --- a/internal/domain/infra/abi/testing_test.go +++ b/internal/domain/infra/abi/testing_test.go @@ -2,6 +2,6 @@ package abi -import "github.com/containers/podman/v5/internal/domain/entities" +import "github.com/containers/podman/v6/internal/domain/entities" var _ entities.TestingEngine = &TestingEngine{} diff --git a/internal/domain/infra/runtime_abi.go b/internal/domain/infra/runtime_abi.go index 2af86eaa88..a63cbfaaec 100644 --- a/internal/domain/infra/runtime_abi.go +++ b/internal/domain/infra/runtime_abi.go @@ -6,10 +6,10 @@ import ( "context" "fmt" - ientities "github.com/containers/podman/v5/internal/domain/entities" - "github.com/containers/podman/v5/internal/domain/infra/tunnel" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities" + ientities "github.com/containers/podman/v6/internal/domain/entities" + "github.com/containers/podman/v6/internal/domain/infra/tunnel" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities" ) // NewTestingEngine factory provides a libpod runtime for testing-specific operations diff --git a/internal/domain/infra/runtime_proxy.go b/internal/domain/infra/runtime_proxy.go index 61f7227131..a05fb67786 100644 --- a/internal/domain/infra/runtime_proxy.go +++ b/internal/domain/infra/runtime_proxy.go @@ -5,10 +5,10 @@ package infra import ( "context" - ientities "github.com/containers/podman/v5/internal/domain/entities" - "github.com/containers/podman/v5/internal/domain/infra/abi" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra" + ientities "github.com/containers/podman/v6/internal/domain/entities" + "github.com/containers/podman/v6/internal/domain/infra/abi" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra" flag "github.com/spf13/pflag" "go.podman.io/storage" ) diff --git a/internal/domain/infra/tunnel/testing.go b/internal/domain/infra/tunnel/testing.go index 0945f9dd91..374abca272 100644 --- a/internal/domain/infra/tunnel/testing.go +++ b/internal/domain/infra/tunnel/testing.go @@ -6,7 +6,7 @@ import ( "context" "syscall" - "github.com/containers/podman/v5/internal/domain/entities" + "github.com/containers/podman/v6/internal/domain/entities" ) type TestingEngine struct { diff --git a/internal/domain/infra/tunnel/testing_test.go b/internal/domain/infra/tunnel/testing_test.go index f803e77a1a..b4262fb68f 100644 --- a/internal/domain/infra/tunnel/testing_test.go +++ b/internal/domain/infra/tunnel/testing_test.go @@ -2,6 +2,6 @@ package tunnel -import "github.com/containers/podman/v5/internal/domain/entities" +import "github.com/containers/podman/v6/internal/domain/entities" var _ entities.TestingEngine = &TestingEngine{} diff --git a/internal/localapi/utils.go b/internal/localapi/utils.go index 5b88758717..890cc563d1 100644 --- a/internal/localapi/utils.go +++ b/internal/localapi/utils.go @@ -12,13 +12,13 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/provider" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/provider" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/specgen" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/fileutils" ) diff --git a/internal/localapi/utils_unsupported.go b/internal/localapi/utils_unsupported.go index 2b56cde4bd..63b2d183cb 100644 --- a/internal/localapi/utils_unsupported.go +++ b/internal/localapi/utils_unsupported.go @@ -5,7 +5,7 @@ package localapi import ( "context" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" ) diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index db2f7084b9..20b2b4471c 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" "go.podman.io/common/libnetwork/types" diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index ceaf8e393f..1bbdd95c5d 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" "go.podman.io/storage" diff --git a/libpod/common_test.go b/libpod/common_test.go index 2c4bdfe05e..77b0f7d783 100644 --- a/libpod/common_test.go +++ b/libpod/common_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/lock" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/lock" "github.com/opencontainers/runtime-tools/generate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/libpod/container.go b/libpod/container.go index 18e153e4c2..558226d63a 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/lock" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/lock" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/pasta" diff --git a/libpod/container_api.go b/libpod/container_api.go index f98b64805b..12d0e858bd 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -11,9 +11,9 @@ import ( "os" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" "go.podman.io/storage/pkg/archive" diff --git a/libpod/container_commit.go b/libpod/container_commit.go index cef7bf4011..43bb56a40c 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/containers/buildah" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" is "go.podman.io/image/v5/storage" diff --git a/libpod/container_config.go b/libpod/container_config.go index fe04617637..df97164c43 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -6,9 +6,9 @@ import ( "net" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/secrets" diff --git a/libpod/container_copy_common.go b/libpod/container_copy_common.go index 66b66e8c92..62a7033612 100644 --- a/libpod/container_copy_common.go +++ b/libpod/container_copy_common.go @@ -13,9 +13,9 @@ import ( buildahCopiah "github.com/containers/buildah/copier" "github.com/containers/buildah/pkg/chrootuser" "github.com/containers/buildah/util" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/shutdown" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/shutdown" + "github.com/containers/podman/v6/pkg/rootless" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/archive" diff --git a/libpod/container_copy_linux.go b/libpod/container_copy_linux.go index eda2857330..931164fb18 100644 --- a/libpod/container_copy_linux.go +++ b/libpod/container_copy_linux.go @@ -7,7 +7,7 @@ import ( "os" "runtime" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/container_exec.go b/libpod/container_exec.go index f343bbee67..9879a007ac 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -12,9 +12,9 @@ import ( "strconv" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/pidhandle" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/pidhandle" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" "go.podman.io/common/pkg/util" diff --git a/libpod/container_graph.go b/libpod/container_graph.go index b2c3afe019..b499231d6a 100644 --- a/libpod/container_graph.go +++ b/libpod/container_graph.go @@ -9,9 +9,9 @@ import ( "strings" "sync" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/parallel" - "github.com/containers/podman/v5/pkg/syncmap" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/parallel" + "github.com/containers/podman/v6/pkg/syncmap" "github.com/sirupsen/logrus" ) diff --git a/libpod/container_graph_test.go b/libpod/container_graph_test.go index d73be360cb..bee6e284ea 100644 --- a/libpod/container_graph_test.go +++ b/libpod/container_graph_test.go @@ -5,7 +5,7 @@ package libpod import ( "testing" - "github.com/containers/podman/v5/libpod/lock" + "github.com/containers/podman/v6/libpod/lock" "github.com/stretchr/testify/assert" ) diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index ba7ca3d62e..9e9e9977f1 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -8,10 +8,10 @@ import ( "maps" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/driver" - "github.com/containers/podman/v5/pkg/signal" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/driver" + "github.com/containers/podman/v6/pkg/signal" + "github.com/containers/podman/v6/pkg/util" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/libpod/container_inspect_freebsd.go b/libpod/container_inspect_freebsd.go index a35b6754b0..62e42d4a8b 100644 --- a/libpod/container_inspect_freebsd.go +++ b/libpod/container_inspect_freebsd.go @@ -3,7 +3,7 @@ package libpod import ( - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/libpod/container_inspect_linux.go b/libpod/container_inspect_linux.go index 63608db79f..7882ca4669 100644 --- a/libpod/container_inspect_linux.go +++ b/libpod/container_inspect_linux.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/util" "github.com/moby/sys/capability" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 268663da79..caad86ca6c 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -23,17 +23,17 @@ import ( "github.com/containers/buildah/copier" "github.com/containers/buildah/pkg/overlay" butil "github.com/containers/buildah/util" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/libpod/shutdown" - "github.com/containers/podman/v5/pkg/ctime" - "github.com/containers/podman/v5/pkg/domain/entities" - envLib "github.com/containers/podman/v5/pkg/env" - "github.com/containers/podman/v5/pkg/lookup" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/selinux" - "github.com/containers/podman/v5/pkg/systemd/notifyproxy" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/libpod/shutdown" + "github.com/containers/podman/v6/pkg/ctime" + "github.com/containers/podman/v6/pkg/domain/entities" + envLib "github.com/containers/podman/v6/pkg/env" + "github.com/containers/podman/v6/pkg/lookup" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/selinux" + "github.com/containers/podman/v6/pkg/systemd/notifyproxy" + "github.com/containers/podman/v6/pkg/util" "github.com/coreos/go-systemd/v22/daemon" securejoin "github.com/cyphar/filepath-securejoin" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go index 50c436c1af..17454b6ffb 100644 --- a/libpod/container_internal_common.go +++ b/libpod/container_internal_common.go @@ -27,15 +27,15 @@ import ( "github.com/containers/buildah/pkg/chrootuser" "github.com/containers/buildah/pkg/overlay" butil "github.com/containers/buildah/util" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/annotations" - "github.com/containers/podman/v5/pkg/checkpoint/crutils" - "github.com/containers/podman/v5/pkg/criu" - "github.com/containers/podman/v5/pkg/lookup" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/annotations" + "github.com/containers/podman/v6/pkg/checkpoint/crutils" + "github.com/containers/podman/v6/pkg/criu" + "github.com/containers/podman/v6/pkg/lookup" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" + "github.com/containers/podman/v6/version" securejoin "github.com/cyphar/filepath-securejoin" runcuser "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/libpod/container_internal_freebsd.go b/libpod/container_internal_freebsd.go index 9edf3361f6..ca74ba3872 100644 --- a/libpod/container_internal_freebsd.go +++ b/libpod/container_internal_freebsd.go @@ -12,7 +12,7 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/pkg/rootless" securejoin "github.com/cyphar/filepath-securejoin" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index a0054ebed3..70dfa3c895 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -14,9 +14,9 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/shutdown" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/shutdown" + "github.com/containers/podman/v6/pkg/rootless" securejoin "github.com/cyphar/filepath-securejoin" "github.com/moby/sys/capability" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/libpod/container_log.go b/libpod/container_log.go index 91c0a50ccf..8ac479c3b7 100644 --- a/libpod/container_log.go +++ b/libpod/container_log.go @@ -9,9 +9,9 @@ import ( "os" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/logs" - systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/logs" + systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" "github.com/nxadm/tail" "github.com/nxadm/tail/watch" "github.com/sirupsen/logrus" diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index f874faa58d..3275e5b37a 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/libpod/logs" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/libpod/logs" + "github.com/containers/podman/v6/pkg/rootless" "github.com/coreos/go-systemd/v22/sdjournal" "github.com/sirupsen/logrus" ) diff --git a/libpod/container_log_unsupported.go b/libpod/container_log_unsupported.go index ebda51ff66..6b1a18dd9b 100644 --- a/libpod/container_log_unsupported.go +++ b/libpod/container_log_unsupported.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/logs" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/logs" ) func (c *Container) readFromJournal(_ context.Context, _ *logs.LogOptions, _ chan *logs.LogLine, _ int64, _ string) error { diff --git a/libpod/container_path_resolution.go b/libpod/container_path_resolution.go index 03f8e5a9c0..8909b59ee7 100644 --- a/libpod/container_path_resolution.go +++ b/libpod/container_path_resolution.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" securejoin "github.com/cyphar/filepath-securejoin" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/libpod/container_stat_common.go b/libpod/container_stat_common.go index 5109c3ee1e..d5a03d14f8 100644 --- a/libpod/container_stat_common.go +++ b/libpod/container_stat_common.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/containers/buildah/copier" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/copy" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/copy" ) // statOnHost stats the specified path *on the host*. It returns the file info diff --git a/libpod/container_stat_linux.go b/libpod/container_stat_linux.go index 5a67c0ea32..a9eb63bfc9 100644 --- a/libpod/container_stat_linux.go +++ b/libpod/container_stat_linux.go @@ -4,7 +4,7 @@ package libpod import ( "github.com/containers/buildah/copier" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) // statInsideMount stats the specified path *inside* the container's mount and PID diff --git a/libpod/container_top_freebsd.go b/libpod/container_top_freebsd.go index 531f672204..01f7cd50eb 100644 --- a/libpod/container_top_freebsd.go +++ b/libpod/container_top_freebsd.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/util" "github.com/google/shlex" "github.com/sirupsen/logrus" ) diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go index a169816278..3ad09a4470 100644 --- a/libpod/container_top_linux.go +++ b/libpod/container_top_linux.go @@ -17,8 +17,8 @@ import ( "syscall" "unsafe" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" "github.com/containers/psgo" "github.com/google/shlex" "github.com/sirupsen/logrus" diff --git a/libpod/container_validate.go b/libpod/container_validate.go index f3fa222f8f..6d812b5321 100644 --- a/libpod/container_validate.go +++ b/libpod/container_validate.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/image/v5/docker" "go.podman.io/image/v5/pkg/shortnames" diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 422ddf607e..539189e72d 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/signal" + "github.com/containers/podman/v6/pkg/signal" "go.podman.io/image/v5/manifest" ) diff --git a/libpod/define/version.go b/libpod/define/version.go index 6832aeac38..e0bb673d06 100644 --- a/libpod/define/version.go +++ b/libpod/define/version.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/version" ) // Overwritten at build time diff --git a/libpod/diff.go b/libpod/diff.go index 1cff86e956..1e83582872 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -5,8 +5,8 @@ package libpod import ( "fmt" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/layers" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/layers" "go.podman.io/storage/pkg/archive" ) diff --git a/libpod/driver/driver.go b/libpod/driver/driver.go index 35ed69fefd..26334cdb9e 100644 --- a/libpod/driver/driver.go +++ b/libpod/driver/driver.go @@ -1,7 +1,7 @@ package driver import ( - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "go.podman.io/storage" ) diff --git a/libpod/events.go b/libpod/events.go index aac29ee579..bcd56509b8 100644 --- a/libpod/events.go +++ b/libpod/events.go @@ -7,8 +7,8 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" "github.com/sirupsen/logrus" ) diff --git a/libpod/events/filters.go b/libpod/events/filters.go index 3bb22114e6..7b23cb91c5 100644 --- a/libpod/events/filters.go +++ b/libpod/events/filters.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/util" ) func generateEventFilter(filter, filterValue string) (func(e *Event) bool, error) { diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index 0fc1d6f71e..5497f2a422 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -10,8 +10,8 @@ import ( "strconv" "time" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" "github.com/coreos/go-systemd/v22/journal" "github.com/coreos/go-systemd/v22/sdjournal" "github.com/sirupsen/logrus" diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index 0e892bea5f..8578983124 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -13,7 +13,7 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/util" "github.com/nxadm/tail" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/lockfile" diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go index 360a4af15d..cea35b72ae 100644 --- a/libpod/healthcheck.go +++ b/libpod/healthcheck.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/shutdown" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/shutdown" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/libpod/healthcheck_config.go b/libpod/healthcheck_config.go index 32947a62b3..03b92bb601 100644 --- a/libpod/healthcheck_config.go +++ b/libpod/healthcheck_config.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/specgenutil" "go.podman.io/image/v5/manifest" ) diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index 2723c1eb21..422abaee46 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -11,9 +11,9 @@ import ( "os/exec" "strings" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/systemd" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/systemd" "github.com/sirupsen/logrus" systemdCommon "go.podman.io/common/pkg/systemd" ) diff --git a/libpod/info.go b/libpod/info.go index 921049b4e7..55f7ba7a10 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -17,8 +17,8 @@ import ( "github.com/containers/buildah" "github.com/containers/buildah/pkg/parse" "github.com/containers/buildah/pkg/util" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/linkmode" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/linkmode" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/version" "go.podman.io/image/v5/pkg/sysregistriesv2" diff --git a/libpod/info_freebsd.go b/libpod/info_freebsd.go index 83dc06cc16..e8158006af 100644 --- a/libpod/info_freebsd.go +++ b/libpod/info_freebsd.go @@ -6,7 +6,7 @@ import ( "fmt" "unsafe" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/info_linux.go b/libpod/info_linux.go index 2ab534070b..c6ca56d81a 100644 --- a/libpod/info_linux.go +++ b/libpod/info_linux.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/pasta" diff --git a/libpod/info_test.go b/libpod/info_test.go index b7de11c576..caf9f2e89a 100644 --- a/libpod/info_test.go +++ b/libpod/info_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/stretchr/testify/assert" ) diff --git a/libpod/kube.go b/libpod/kube.go index dd5d527a80..986101b3d5 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -16,17 +16,17 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/env" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" - v12 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" - "github.com/containers/podman/v5/pkg/lookup" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/env" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" + v12 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" + "github.com/containers/podman/v6/pkg/lookup" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" diff --git a/libpod/lock/file_lock_manager.go b/libpod/lock/file_lock_manager.go index 0f6757a6da..b929b1725c 100644 --- a/libpod/lock/file_lock_manager.go +++ b/libpod/lock/file_lock_manager.go @@ -1,8 +1,8 @@ package lock import ( - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/lock/file" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/lock/file" ) // FileLockManager manages shared memory locks. diff --git a/libpod/lock/shm_lock_manager_linux.go b/libpod/lock/shm_lock_manager_linux.go index ba438b9c61..79bafba462 100644 --- a/libpod/lock/shm_lock_manager_linux.go +++ b/libpod/lock/shm_lock_manager_linux.go @@ -6,7 +6,7 @@ import ( "fmt" "syscall" - "github.com/containers/podman/v5/libpod/lock/shm" + "github.com/containers/podman/v6/libpod/lock/shm" ) // SHMLockManager manages shared memory locks. diff --git a/libpod/logs/log.go b/libpod/logs/log.go index e6ad32f99b..dde16e4435 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/containers/podman/v5/libpod/logs/reversereader" + "github.com/containers/podman/v6/libpod/logs/reversereader" "github.com/nxadm/tail" "github.com/sirupsen/logrus" ) diff --git a/libpod/networking_common.go b/libpod/networking_common.go index 28ee91a6dd..57dd956fa2 100644 --- a/libpod/networking_common.go +++ b/libpod/networking_common.go @@ -10,10 +10,10 @@ import ( "slices" "sort" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/rootless" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/libnetwork/types" diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go index 76b189234c..3000ff25ce 100644 --- a/libpod/networking_freebsd.go +++ b/libpod/networking_freebsd.go @@ -11,7 +11,7 @@ import ( "os/exec" "github.com/containers/buildah/pkg/jail" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" ) diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 7c58936b2f..e188180697 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -7,8 +7,8 @@ import ( "net" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" diff --git a/libpod/networking_linux_test.go b/libpod/networking_linux_test.go index 4f35ce967e..873e1626cb 100644 --- a/libpod/networking_linux_test.go +++ b/libpod/networking_linux_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "go.podman.io/common/libnetwork/types" ) diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go index 9685f8507a..0b2243f6a5 100644 --- a/libpod/networking_slirp4netns.go +++ b/libpod/networking_slirp4netns.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/slirp4netns" "go.podman.io/common/libnetwork/types" diff --git a/libpod/oci.go b/libpod/oci.go index 75c1ce6845..548490be3b 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -5,7 +5,7 @@ package libpod import ( "net/http" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/pkg/resize" ) diff --git a/libpod/oci_conmon_attach_common.go b/libpod/oci_conmon_attach_common.go index 7debcaa71f..d9b4240e0c 100644 --- a/libpod/oci_conmon_attach_common.go +++ b/libpod/oci_conmon_attach_common.go @@ -11,8 +11,8 @@ import ( "path/filepath" "syscall" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/moby/term" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index 6bf3576c52..0138f037fa 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -22,14 +22,14 @@ import ( "time" conmonConfig "github.com/containers/conmon/runner/config" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/logs" - "github.com/containers/podman/v5/pkg/checkpoint/crutils" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/util" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/logs" + "github.com/containers/podman/v6/pkg/checkpoint/crutils" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/util" + "github.com/containers/podman/v6/utils" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" diff --git a/libpod/oci_conmon_exec_common.go b/libpod/oci_conmon_exec_common.go index 45350f9382..2e6d6fb0c9 100644 --- a/libpod/oci_conmon_exec_common.go +++ b/libpod/oci_conmon_exec_common.go @@ -15,10 +15,10 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/lookup" - "github.com/containers/podman/v5/pkg/pidhandle" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/lookup" + "github.com/containers/podman/v6/pkg/pidhandle" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 02567c091f..29678b50e4 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/rootless" runcconfig "github.com/opencontainers/cgroups" devices "github.com/opencontainers/cgroups/devices/config" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/libpod/oci_missing.go b/libpod/oci_missing.go index a874d6bfc2..1ab17e5418 100644 --- a/libpod/oci_missing.go +++ b/libpod/oci_missing.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sync" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" diff --git a/libpod/oci_util.go b/libpod/oci_util.go index 29695206f7..b2eb7a90fb 100644 --- a/libpod/oci_util.go +++ b/libpod/oci_util.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" ) diff --git a/libpod/options.go b/libpod/options.go index d5055d6c9f..b65c5b8a77 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -15,10 +15,10 @@ import ( "time" "github.com/containers/buildah/pkg/parse" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" diff --git a/libpod/plugin/volume_api.go b/libpod/plugin/volume_api.go index 0e6ff91350..ec58890ec7 100644 --- a/libpod/plugin/volume_api.go +++ b/libpod/plugin/volume_api.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/docker/go-plugins-helpers/sdk" "github.com/docker/go-plugins-helpers/volume" jsoniter "github.com/json-iterator/go" diff --git a/libpod/pod.go b/libpod/pod.go index 5ab43804bd..1e5944340f 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/lock" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/lock" "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/pkg/config" ) diff --git a/libpod/pod_api.go b/libpod/pod_api.go index adaff0a322..f8a7e96c59 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -7,10 +7,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/parallel" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/parallel" + "github.com/containers/podman/v6/pkg/rootless" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go index b559ae7f64..52c77ce40c 100644 --- a/libpod/pod_internal.go +++ b/libpod/pod_internal.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "go.podman.io/storage/pkg/stringid" ) diff --git a/libpod/pod_internal_linux.go b/libpod/pod_internal_linux.go index e4ea3d3074..10d9495d29 100644 --- a/libpod/pod_internal_linux.go +++ b/libpod/pod_internal_linux.go @@ -6,8 +6,8 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" ) diff --git a/libpod/pod_status.go b/libpod/pod_status.go index 186709a29b..fed4fbb342 100644 --- a/libpod/pod_status.go +++ b/libpod/pod_status.go @@ -2,7 +2,7 @@ package libpod -import "github.com/containers/podman/v5/libpod/define" +import "github.com/containers/podman/v6/libpod/define" // GetPodStatus determines the status of the pod based on the // statuses of the containers in the pod. diff --git a/libpod/pod_top_freebsd.go b/libpod/pod_top_freebsd.go index 0175944103..3c4bdbb5cc 100644 --- a/libpod/pod_top_freebsd.go +++ b/libpod/pod_top_freebsd.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) // GetPodPidInformation returns process-related data of all processes in diff --git a/libpod/pod_top_linux.go b/libpod/pod_top_linux.go index 7671789920..8d93b59695 100644 --- a/libpod/pod_top_linux.go +++ b/libpod/pod_top_linux.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" "github.com/containers/psgo" ) diff --git a/libpod/reset.go b/libpod/reset.go index addb40c706..60ccab1e49 100644 --- a/libpod/reset.go +++ b/libpod/reset.go @@ -9,9 +9,9 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/types" diff --git a/libpod/runtime.go b/libpod/runtime.go index 7e83fffc56..f74d13264e 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -17,16 +17,16 @@ import ( "time" "github.com/containers/buildah/pkg/parse" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/libpod/lock" - "github.com/containers/podman/v5/libpod/plugin" - "github.com/containers/podman/v5/libpod/shutdown" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/systemd" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/libpod/lock" + "github.com/containers/podman/v6/libpod/plugin" + "github.com/containers/podman/v6/libpod/shutdown" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/systemd" + "github.com/containers/podman/v6/pkg/util" "github.com/docker/docker/pkg/namesgenerator" "github.com/hashicorp/go-multierror" jsoniter "github.com/json-iterator/go" diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go index ed16dcace0..fcd6fd174a 100644 --- a/libpod/runtime_cstorage.go +++ b/libpod/runtime_cstorage.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/storage" ) diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index bea313b2f8..2ec90c4499 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -16,13 +16,13 @@ import ( "time" "github.com/containers/buildah" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/libpod/shutdown" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/libpod/shutdown" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/util" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 98474ee90a..ecf46443b7 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -9,8 +9,8 @@ import ( buildahDefine "github.com/containers/buildah/define" "github.com/containers/buildah/imagebuildah" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/image/v5/docker/reference" diff --git a/libpod/runtime_linux.go b/libpod/runtime_linux.go index 07f9db5e2a..b8b6edc3de 100644 --- a/libpod/runtime_linux.go +++ b/libpod/runtime_linux.go @@ -9,8 +9,8 @@ import ( "golang.org/x/sys/unix" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/systemd" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/systemd" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" ) diff --git a/libpod/runtime_migrate.go b/libpod/runtime_migrate.go index 6b2f921898..d110503635 100644 --- a/libpod/runtime_migrate.go +++ b/libpod/runtime_migrate.go @@ -6,7 +6,7 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" ) diff --git a/libpod/runtime_migrate_linux.go b/libpod/runtime_migrate_linux.go index 162d72edf2..51b06b3610 100644 --- a/libpod/runtime_migrate_linux.go +++ b/libpod/runtime_migrate_linux.go @@ -8,8 +8,8 @@ import ( "strconv" "syscall" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" ) func (r *Runtime) stopPauseProcess() error { diff --git a/libpod/runtime_pod.go b/libpod/runtime_pod.go index 28b6619abf..4fcaaa9705 100644 --- a/libpod/runtime_pod.go +++ b/libpod/runtime_pod.go @@ -9,7 +9,7 @@ import ( "slices" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) // Contains the public Runtime API for pods diff --git a/libpod/runtime_pod_common.go b/libpod/runtime_pod_common.go index 36e21c3fb8..3fa487a149 100644 --- a/libpod/runtime_pod_common.go +++ b/libpod/runtime_pod_common.go @@ -7,9 +7,9 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/specgen" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" ) diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index 0dec268d44..f5804decc0 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" diff --git a/libpod/runtime_renumber.go b/libpod/runtime_renumber.go index 953e832427..99afe7b6af 100644 --- a/libpod/runtime_renumber.go +++ b/libpod/runtime_renumber.go @@ -5,8 +5,8 @@ package libpod import ( "fmt" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" ) // RenumberLocks reassigns lock numbers for all containers and pods in the diff --git a/libpod/runtime_volume.go b/libpod/runtime_volume.go index ff04eec3cc..dd9995454b 100644 --- a/libpod/runtime_volume.go +++ b/libpod/runtime_volume.go @@ -6,9 +6,9 @@ import ( "context" "errors" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/domain/entities/reports" ) // Contains the public Runtime API for volumes diff --git a/libpod/runtime_volume_common.go b/libpod/runtime_volume_common.go index e67bc97ecf..8717dbd9e7 100644 --- a/libpod/runtime_volume_common.go +++ b/libpod/runtime_volume_common.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - volplugin "github.com/containers/podman/v5/libpod/plugin" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + volplugin "github.com/containers/podman/v6/libpod/plugin" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" diff --git a/libpod/service.go b/libpod/service.go index e5cbb7b536..3d30548c1b 100644 --- a/libpod/service.go +++ b/libpod/service.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/libpod/sqlite_state.go b/libpod/sqlite_state.go index f99cd41dd9..ba044f560f 100644 --- a/libpod/sqlite_state.go +++ b/libpod/sqlite_state.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" "go.podman.io/storage" diff --git a/libpod/sqlite_state_internal.go b/libpod/sqlite_state_internal.go index a295380662..ae583a286c 100644 --- a/libpod/sqlite_state_internal.go +++ b/libpod/sqlite_state_internal.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" diff --git a/libpod/state_test.go b/libpod/state_test.go index 63246f5990..5522c7a6c8 100644 --- a/libpod/state_test.go +++ b/libpod/state_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/lock" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/lock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.podman.io/common/libnetwork/types" diff --git a/libpod/stats_common.go b/libpod/stats_common.go index 9d301a69d6..4d1d2e368e 100644 --- a/libpod/stats_common.go +++ b/libpod/stats_common.go @@ -5,7 +5,7 @@ package libpod import ( "fmt" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) // GetContainerStats gets the running stats for a given container. diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go index 2f7dca63ed..f8f2748671 100644 --- a/libpod/stats_freebsd.go +++ b/libpod/stats_freebsd.go @@ -7,8 +7,8 @@ import ( "math" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rctl" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rctl" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" diff --git a/libpod/stats_linux.go b/libpod/stats_linux.go index 8ee32cdd54..d9d3d9cb17 100644 --- a/libpod/stats_linux.go +++ b/libpod/stats_linux.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" runccgroup "github.com/opencontainers/cgroups" "go.podman.io/common/pkg/cgroups" "golang.org/x/sys/unix" diff --git a/libpod/storage.go b/libpod/storage.go index 0acfc2afa8..50d3fd9969 100644 --- a/libpod/storage.go +++ b/libpod/storage.go @@ -7,7 +7,7 @@ import ( "errors" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" istorage "go.podman.io/image/v5/storage" diff --git a/libpod/util.go b/libpod/util.go index a6b76f5d88..229e31425b 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -16,8 +16,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils/apiutil" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" diff --git a/libpod/util_linux.go b/libpod/util_linux.go index ead130b2ff..4e9c993545 100644 --- a/libpod/util_linux.go +++ b/libpod/util_linux.go @@ -9,8 +9,8 @@ import ( "strings" "syscall" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" diff --git a/libpod/volume.go b/libpod/volume.go index 27108e8847..e388d7441f 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -8,10 +8,10 @@ import ( "maps" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/lock" - "github.com/containers/podman/v5/libpod/plugin" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/lock" + "github.com/containers/podman/v6/libpod/plugin" + "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/directory" diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go index fc4316a4d2..58790bb449 100644 --- a/libpod/volume_inspect.go +++ b/libpod/volume_inspect.go @@ -6,7 +6,7 @@ import ( "fmt" "maps" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/sirupsen/logrus" ) diff --git a/libpod/volume_internal.go b/libpod/volume_internal.go index e512582305..a5891473f5 100644 --- a/libpod/volume_internal.go +++ b/libpod/volume_internal.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) // Creates a new volume diff --git a/libpod/volume_internal_common.go b/libpod/volume_internal_common.go index c9a20820fa..693e08921e 100644 --- a/libpod/volume_internal_common.go +++ b/libpod/volume_internal_common.go @@ -8,7 +8,7 @@ import ( "os/exec" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/pkg/annotations/validate.go b/pkg/annotations/validate.go index 1e9c3bf866..b4f8bdf89f 100644 --- a/pkg/annotations/validate.go +++ b/pkg/annotations/validate.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) // regexErrorMsg returns a string explanation of a regex validation failure. diff --git a/pkg/annotations/validate_test.go b/pkg/annotations/validate_test.go index b29385fcf9..31565a8689 100644 --- a/pkg/annotations/validate_test.go +++ b/pkg/annotations/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) func TestValidateAnnotations(t *testing.T) { diff --git a/pkg/api/handlers/compat/auth.go b/pkg/api/handlers/compat/auth.go index c0a0ee91e7..a6fa4fea50 100644 --- a/pkg/api/handlers/compat/auth.go +++ b/pkg/api/handlers/compat/auth.go @@ -10,10 +10,10 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/docker/api/types/registry" "go.podman.io/common/pkg/auth" DockerClient "go.podman.io/image/v5/docker" diff --git a/pkg/api/handlers/compat/changes.go b/pkg/api/handlers/compat/changes.go index cfcb0990f6..aa352f9d53 100644 --- a/pkg/api/handlers/compat/changes.go +++ b/pkg/api/handlers/compat/changes.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" ) func Changes(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go index 596248e43b..35216fadd1 100644 --- a/pkg/api/handlers/compat/containers.go +++ b/pkg/api/handlers/compat/containers.go @@ -13,17 +13,17 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/filters" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/ps" - "github.com/containers/podman/v5/pkg/signal" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/filters" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/ps" + "github.com/containers/podman/v6/pkg/signal" + "github.com/containers/podman/v6/pkg/util" dockerBackend "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" diff --git a/pkg/api/handlers/compat/containers_archive.go b/pkg/api/handlers/compat/containers_archive.go index 8849641525..da14d8fa96 100644 --- a/pkg/api/handlers/compat/containers_archive.go +++ b/pkg/api/handlers/compat/containers_archive.go @@ -11,13 +11,13 @@ import ( "errors" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/copy" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/copy" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/containers_attach.go b/pkg/api/handlers/compat/containers_attach.go index 6dacdb29ee..fe30e81ea9 100644 --- a/pkg/api/handlers/compat/containers_attach.go +++ b/pkg/api/handlers/compat/containers_attach.go @@ -6,10 +6,10 @@ import ( "errors" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - "github.com/containers/podman/v5/pkg/api/server/idle" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + "github.com/containers/podman/v6/pkg/api/server/idle" + api "github.com/containers/podman/v6/pkg/api/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go index 5cd9fe19fa..51759de3cf 100644 --- a/pkg/api/handlers/compat/containers_create.go +++ b/pkg/api/handlers/compat/containers_create.go @@ -14,16 +14,16 @@ import ( "strings" "github.com/containers/buildah/pkg/parse" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutil" "github.com/docker/docker/api/types/mount" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/types" diff --git a/pkg/api/handlers/compat/containers_export.go b/pkg/api/handlers/compat/containers_export.go index 9cc4fd9f99..7253986535 100644 --- a/pkg/api/handlers/compat/containers_export.go +++ b/pkg/api/handlers/compat/containers_export.go @@ -6,9 +6,9 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" ) func ExportContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go index 17cca4f45c..66328e7d0b 100644 --- a/pkg/api/handlers/compat/containers_logs.go +++ b/pkg/api/handlers/compat/containers_logs.go @@ -12,11 +12,11 @@ import ( "sync" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/logs" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/logs" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/util" log "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/containers_pause.go b/pkg/api/handlers/compat/containers_pause.go index b002d6bac8..f9ab35bc65 100644 --- a/pkg/api/handlers/compat/containers_pause.go +++ b/pkg/api/handlers/compat/containers_pause.go @@ -5,9 +5,9 @@ package compat import ( "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" ) func PauseContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_prune.go b/pkg/api/handlers/compat/containers_prune.go index fe2de39358..aac100e872 100644 --- a/pkg/api/handlers/compat/containers_prune.go +++ b/pkg/api/handlers/compat/containers_prune.go @@ -8,13 +8,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/filters" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/filters" + "github.com/containers/podman/v6/pkg/util" ) func PruneContainers(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_restart.go b/pkg/api/handlers/compat/containers_restart.go index 91e8573f5f..8cf0d61fd4 100644 --- a/pkg/api/handlers/compat/containers_restart.go +++ b/pkg/api/handlers/compat/containers_restart.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" ) func RestartContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go index ef4d7c5f82..9738963666 100644 --- a/pkg/api/handlers/compat/containers_start.go +++ b/pkg/api/handlers/compat/containers_start.go @@ -6,12 +6,12 @@ import ( "errors" "net/http" - api "github.com/containers/podman/v5/pkg/api/types" + api "github.com/containers/podman/v6/pkg/api/types" "github.com/sirupsen/logrus" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" ) func StartContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_stats.go b/pkg/api/handlers/compat/containers_stats.go index 3a86971e93..f407bf56be 100644 --- a/pkg/api/handlers/compat/containers_stats.go +++ b/pkg/api/handlers/compat/containers_stats.go @@ -8,10 +8,10 @@ import ( "net/http" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/containers_stats_freebsd.go b/pkg/api/handlers/compat/containers_stats_freebsd.go index 2dd1b81fe1..2c7be6a246 100644 --- a/pkg/api/handlers/compat/containers_stats_freebsd.go +++ b/pkg/api/handlers/compat/containers_stats_freebsd.go @@ -5,8 +5,8 @@ package compat import ( "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" "github.com/docker/docker/api/types/container" ) diff --git a/pkg/api/handlers/compat/containers_stats_linux.go b/pkg/api/handlers/compat/containers_stats_linux.go index 14dbeb26f7..1773f05859 100644 --- a/pkg/api/handlers/compat/containers_stats_linux.go +++ b/pkg/api/handlers/compat/containers_stats_linux.go @@ -6,8 +6,8 @@ import ( "encoding/json" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" "github.com/docker/docker/api/types/container" runccgroups "github.com/opencontainers/cgroups" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/compat/containers_stop.go b/pkg/api/handlers/compat/containers_stop.go index 208c33f043..5912ecf583 100644 --- a/pkg/api/handlers/compat/containers_stop.go +++ b/pkg/api/handlers/compat/containers_stop.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/util" ) func StopContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_top.go b/pkg/api/handlers/compat/containers_top.go index 8befc6b944..6a96964c7a 100644 --- a/pkg/api/handlers/compat/containers_top.go +++ b/pkg/api/handlers/compat/containers_top.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/containers_unpause.go b/pkg/api/handlers/compat/containers_unpause.go index 70205d258e..75c1675031 100644 --- a/pkg/api/handlers/compat/containers_unpause.go +++ b/pkg/api/handlers/compat/containers_unpause.go @@ -5,9 +5,9 @@ package compat import ( "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" ) func UnpauseContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go index ec6362fb51..ba1fe645d5 100644 --- a/pkg/api/handlers/compat/events.go +++ b/pkg/api/handlers/compat/events.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util" jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/exec.go b/pkg/api/handlers/compat/exec.go index fbf925aba8..a5f161186e 100644 --- a/pkg/api/handlers/compat/exec.go +++ b/pkg/api/handlers/compat/exec.go @@ -9,15 +9,15 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - "github.com/containers/podman/v5/pkg/api/server/idle" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + "github.com/containers/podman/v6/pkg/api/server/idle" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/mux" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index b800714482..660df67ab7 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -12,15 +12,15 @@ import ( "time" "github.com/containers/buildah" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - "github.com/containers/podman/v5/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/util" dockerContainer "github.com/docker/docker/api/types/container" dockerImage "github.com/docker/docker/api/types/image" dockerStorage "github.com/docker/docker/api/types/storage" diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 73cd14ee57..c70fc9934a 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -22,14 +22,14 @@ import ( "github.com/containers/buildah" buildahDefine "github.com/containers/buildah/define" "github.com/containers/buildah/pkg/parse" - "github.com/containers/podman/v5/internal/localapi" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/channel" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/internal/localapi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/channel" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go index 4d55ff4a6b..4140462fd0 100644 --- a/pkg/api/handlers/compat/images_history.go +++ b/pkg/api/handlers/compat/images_history.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" ) func HistoryImage(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/images_prune.go b/pkg/api/handlers/compat/images_prune.go index 282fa1bd22..cda9e05bae 100644 --- a/pkg/api/handlers/compat/images_prune.go +++ b/pkg/api/handlers/compat/images_prune.go @@ -8,13 +8,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/util" dockerImage "github.com/docker/docker/api/types/image" ) diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go index b7ff0dd5c4..f610afdb9f 100644 --- a/pkg/api/handlers/compat/images_push.go +++ b/pkg/api/handlers/compat/images_push.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/docker/docker/pkg/jsonmessage" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go index 52577c8f9c..0ba33007d9 100644 --- a/pkg/api/handlers/compat/images_remove.go +++ b/pkg/api/handlers/compat/images_remove.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/compat/images_search.go b/pkg/api/handlers/compat/images_search.go index 787c721c38..bd8165aea1 100644 --- a/pkg/api/handlers/compat/images_search.go +++ b/pkg/api/handlers/compat/images_search.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" "go.podman.io/image/v5/types" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/compat/images_tag.go b/pkg/api/handlers/compat/images_tag.go index 203b9e5638..98647fa9f7 100644 --- a/pkg/api/handlers/compat/images_tag.go +++ b/pkg/api/handlers/compat/images_tag.go @@ -7,9 +7,9 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" "go.podman.io/common/libimage" ) diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go index cb3fa79009..f6cac300e7 100644 --- a/pkg/api/handlers/compat/info.go +++ b/pkg/api/handlers/compat/info.go @@ -10,12 +10,12 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/rootless" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/swarm" dockerSystem "github.com/docker/docker/api/types/system" diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go index c835ffdfed..f9dadd95fc 100644 --- a/pkg/api/handlers/compat/networks.go +++ b/pkg/api/handlers/compat/networks.go @@ -10,13 +10,13 @@ import ( "net" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/util" nettypes "go.podman.io/common/libnetwork/types" netutil "go.podman.io/common/libnetwork/util" diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go index 8ca5415164..fca00ab636 100644 --- a/pkg/api/handlers/compat/resize.go +++ b/pkg/api/handlers/compat/resize.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" "github.com/gorilla/mux" "go.podman.io/common/pkg/resize" ) diff --git a/pkg/api/handlers/compat/secrets.go b/pkg/api/handlers/compat/secrets.go index 852eb85a12..b032c1d151 100644 --- a/pkg/api/handlers/compat/secrets.go +++ b/pkg/api/handlers/compat/secrets.go @@ -11,12 +11,12 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/util" ) func ListSecrets(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/system.go b/pkg/api/handlers/compat/system.go index b8392725e6..7a84ddd865 100644 --- a/pkg/api/handlers/compat/system.go +++ b/pkg/api/handlers/compat/system.go @@ -6,13 +6,13 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - "github.com/containers/podman/v5/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" docker "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/build" "github.com/docker/docker/api/types/container" diff --git a/pkg/api/handlers/compat/unsupported.go b/pkg/api/handlers/compat/unsupported.go index 476502fe06..bed7ba6004 100644 --- a/pkg/api/handlers/compat/unsupported.go +++ b/pkg/api/handlers/compat/unsupported.go @@ -6,8 +6,8 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + "github.com/containers/podman/v6/pkg/errorhandling" log "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go index e1c40007e7..5f72b0f0e0 100644 --- a/pkg/api/handlers/compat/version.go +++ b/pkg/api/handlers/compat/version.go @@ -8,13 +8,13 @@ import ( goRuntime "runtime" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/version" ) func VersionHandler(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go index 46756a462c..3d594ab204 100644 --- a/pkg/api/handlers/compat/volumes.go +++ b/pkg/api/handlers/compat/volumes.go @@ -11,14 +11,14 @@ import ( "net/url" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/filters" - "github.com/containers/podman/v5/pkg/domain/infra/abi/parse" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/filters" + "github.com/containers/podman/v6/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v6/pkg/util" "github.com/docker/docker/api/types/volume" ) diff --git a/pkg/api/handlers/decoder.go b/pkg/api/handlers/decoder.go index 6a3cbf8d5e..385fb48724 100644 --- a/pkg/api/handlers/decoder.go +++ b/pkg/api/handlers/decoder.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" diff --git a/pkg/api/handlers/libpod/artifacts.go b/pkg/api/handlers/libpod/artifacts.go index 6622ba8820..ab7272b416 100644 --- a/pkg/api/handlers/libpod/artifacts.go +++ b/pkg/api/handlers/libpod/artifacts.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - domain_utils "github.com/containers/podman/v5/pkg/domain/utils" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + domain_utils "github.com/containers/podman/v6/pkg/domain/utils" "github.com/docker/distribution/registry/api/errcode" "github.com/gorilla/schema" libartifact_types "go.podman.io/common/pkg/libartifact/types" diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index 23e79620d5..c2f9bbe618 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -10,16 +10,16 @@ import ( "os" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/compat" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go index 8e09b452b9..5a30dbc715 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -10,14 +10,14 @@ import ( "net/http" "strconv" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgen/generate" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgen/generate" + "github.com/containers/podman/v6/pkg/specgenutil" "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/libpod/containers_stats.go b/pkg/api/handlers/libpod/containers_stats.go index 3d93b531f2..fe312ea7ca 100644 --- a/pkg/api/handlers/libpod/containers_stats.go +++ b/pkg/api/handlers/libpod/containers_stats.go @@ -8,12 +8,12 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/rootless" "github.com/gorilla/schema" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go index 114f389e12..6ee9fd2757 100644 --- a/pkg/api/handlers/libpod/generate.go +++ b/pkg/api/handlers/libpod/generate.go @@ -6,11 +6,11 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "go.podman.io/common/pkg/config" ) diff --git a/pkg/api/handlers/libpod/healthcheck.go b/pkg/api/handlers/libpod/healthcheck.go index bccce668ea..285d12d1ef 100644 --- a/pkg/api/handlers/libpod/healthcheck.go +++ b/pkg/api/handlers/libpod/healthcheck.go @@ -5,10 +5,10 @@ package libpod import ( "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" ) func RunHealthCheck(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 74cf15ca33..7f84ab69ee 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -16,20 +16,20 @@ import ( "strings" "github.com/containers/buildah" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/channel" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - domainUtils "github.com/containers/podman/v5/pkg/domain/utils" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/util" - utils2 "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/channel" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + domainUtils "github.com/containers/podman/v6/pkg/domain/utils" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/util" + utils2 "github.com/containers/podman/v6/utils" "github.com/docker/docker/pkg/jsonmessage" "github.com/gorilla/schema" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/images_pull.go b/pkg/api/handlers/libpod/images_pull.go index 32471a3dcb..17ca000e48 100644 --- a/pkg/api/handlers/libpod/images_pull.go +++ b/pkg/api/handlers/libpod/images_pull.go @@ -10,12 +10,12 @@ import ( "net/http" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/channel" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/channel" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/gorilla/schema" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/api/handlers/libpod/images_push.go b/pkg/api/handlers/libpod/images_push.go index e3e4135dfe..92330ecae6 100644 --- a/pkg/api/handlers/libpod/images_push.go +++ b/pkg/api/handlers/libpod/images_push.go @@ -9,13 +9,13 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/channel" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/channel" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" diff --git a/pkg/api/handlers/libpod/info.go b/pkg/api/handlers/libpod/info.go index 546991699b..7529c27e29 100644 --- a/pkg/api/handlers/libpod/info.go +++ b/pkg/api/handlers/libpod/info.go @@ -5,10 +5,10 @@ package libpod import ( "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/infra/abi" ) func GetInfo(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/kube.go b/pkg/api/handlers/libpod/kube.go index 6b6a47e2d0..1f8274e866 100644 --- a/pkg/api/handlers/libpod/kube.go +++ b/pkg/api/handlers/libpod/kube.go @@ -14,12 +14,12 @@ import ( "go.podman.io/storage/pkg/archive" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go index 40a059e336..21ecbabde8 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -18,17 +18,17 @@ import ( "strings" "sync" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - "github.com/containers/podman/v5/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/channel" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - domainUtils "github.com/containers/podman/v5/pkg/domain/utils" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/channel" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + domainUtils "github.com/containers/podman/v6/pkg/domain/utils" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/opencontainers/go-digest" diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go index 9a98f3393c..a16dfba5c0 100644 --- a/pkg/api/handlers/libpod/networks.go +++ b/pkg/api/handlers/libpod/networks.go @@ -9,13 +9,13 @@ import ( "errors" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" "go.podman.io/common/libnetwork/types" ) diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 2610110931..6784d8b09d 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -10,17 +10,17 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgen/generate" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgen/generate" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/quadlets.go b/pkg/api/handlers/libpod/quadlets.go index 861e26e297..27457344dd 100644 --- a/pkg/api/handlers/libpod/quadlets.go +++ b/pkg/api/handlers/libpod/quadlets.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/util" ) func ListQuadlets(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/secrets.go b/pkg/api/handlers/libpod/secrets.go index c5b6c543d0..0dd9c50255 100644 --- a/pkg/api/handlers/libpod/secrets.go +++ b/pkg/api/handlers/libpod/secrets.go @@ -6,11 +6,11 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "go.podman.io/common/pkg/secrets" ) diff --git a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/swagger_spec.go index 1f5d9a927c..fec64ae96d 100644 --- a/pkg/api/handlers/libpod/swagger_spec.go +++ b/pkg/api/handlers/libpod/swagger_spec.go @@ -8,7 +8,7 @@ import ( "net/http" "os" - "github.com/containers/podman/v5/pkg/api/handlers/utils" + "github.com/containers/podman/v6/pkg/api/handlers/utils" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go index b4ff77245c..05ac6cc915 100644 --- a/pkg/api/handlers/libpod/system.go +++ b/pkg/api/handlers/libpod/system.go @@ -7,12 +7,12 @@ import ( "net/http" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go index 43efb73ff7..d1554c665a 100644 --- a/pkg/api/handlers/libpod/volumes.go +++ b/pkg/api/handlers/libpod/volumes.go @@ -10,16 +10,16 @@ import ( "net/http" "net/url" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers/utils" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/filters" - "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/domain/infra/abi/parse" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers/utils" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/filters" + "github.com/containers/podman/v6/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/swagger/errors.go b/pkg/api/handlers/swagger/errors.go index 69522900e2..b3f624fc62 100644 --- a/pkg/api/handlers/swagger/errors.go +++ b/pkg/api/handlers/swagger/errors.go @@ -4,7 +4,7 @@ package swagger import ( - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/errorhandling" ) // Error model embedded in swagger:response to aid in documentation generation diff --git a/pkg/api/handlers/swagger/models.go b/pkg/api/handlers/swagger/models.go index 4438b94b8c..d1b71e651b 100644 --- a/pkg/api/handlers/swagger/models.go +++ b/pkg/api/handlers/swagger/models.go @@ -4,7 +4,7 @@ package swagger import ( - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" ) diff --git a/pkg/api/handlers/swagger/responses.go b/pkg/api/handlers/swagger/responses.go index 5ec60bc2dd..11b3eb0cff 100644 --- a/pkg/api/handlers/swagger/responses.go +++ b/pkg/api/handlers/swagger/responses.go @@ -4,11 +4,11 @@ package swagger import ( - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/inspect" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/inspect" "github.com/docker/docker/api/types/container" dockerImage "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/network" diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 6a79103b4a..95f8b29d83 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -1,8 +1,8 @@ package handlers import ( - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" docker "github.com/docker/docker/api/types" dockerBackend "github.com/docker/docker/api/types/backend" dockerContainer "github.com/docker/docker/api/types/container" diff --git a/pkg/api/handlers/types/types.go b/pkg/api/handlers/types/types.go index 7329fc7a7a..4e39851a87 100644 --- a/pkg/api/handlers/types/types.go +++ b/pkg/api/handlers/types/types.go @@ -1,6 +1,6 @@ package types -import "github.com/containers/podman/v5/pkg/domain/entities" +import "github.com/containers/podman/v6/pkg/domain/entities" // LibpodImagesRemoveReport is the return type for image removal via the rest // api. diff --git a/pkg/api/handlers/utils/apiutil/apiutil.go b/pkg/api/handlers/utils/apiutil/apiutil.go index 41037c04a3..03dec97e42 100644 --- a/pkg/api/handlers/utils/apiutil/apiutil.go +++ b/pkg/api/handlers/utils/apiutil/apiutil.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/blang/semver/v4" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/version" "github.com/gorilla/mux" ) diff --git a/pkg/api/handlers/utils/apiutil/apiutil_test.go b/pkg/api/handlers/utils/apiutil/apiutil_test.go index 02a1194d06..a6fed9cd2d 100644 --- a/pkg/api/handlers/utils/apiutil/apiutil_test.go +++ b/pkg/api/handlers/utils/apiutil/apiutil_test.go @@ -9,7 +9,7 @@ import ( "net/http/httptest" "testing" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/version" "github.com/gorilla/mux" ) diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go index b73a3071a6..3a03737504 100644 --- a/pkg/api/handlers/utils/containers.go +++ b/pkg/api/handlers/utils/containers.go @@ -11,17 +11,17 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/events" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/libpod/events" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/handlers" "github.com/sirupsen/logrus" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v6/libpod" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go index e25fdbd67f..c46372808f 100644 --- a/pkg/api/handlers/utils/errors.go +++ b/pkg/api/handlers/utils/errors.go @@ -7,8 +7,8 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/errorhandling" log "github.com/sirupsen/logrus" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go index dec453eddb..51b6009be7 100644 --- a/pkg/api/handlers/utils/handler.go +++ b/pkg/api/handlers/utils/handler.go @@ -19,9 +19,9 @@ import ( "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" - "github.com/containers/podman/v5/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/bindings/images" ) // IsLibpodRequest returns true if the request related to a libpod endpoint diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index 6f3c96c86a..ce7acf47e4 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -9,9 +9,9 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/libpod" - api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/libpod" + api "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/docker/distribution/registry/api/errcode" "github.com/docker/docker/pkg/jsonmessage" "github.com/sirupsen/logrus" diff --git a/pkg/api/server/doc.go b/pkg/api/server/doc.go index 63a9bc0a3a..3d6424e6b6 100644 --- a/pkg/api/server/doc.go +++ b/pkg/api/server/doc.go @@ -29,15 +29,15 @@ // // 'podman info' // -// curl --unix-socket /run/podman/podman.sock http://d/v5.0.0/libpod/info +// curl --unix-socket /run/podman/podman.sock http://d/v6.0.0/libpod/info // // 'podman pull quay.io/containers/podman' // -// curl -XPOST --unix-socket /run/podman/podman.sock -v 'http://d/v5.0.0/images/create?fromImage=quay.io%2Fcontainers%2Fpodman' +// curl -XPOST --unix-socket /run/podman/podman.sock -v 'http://d/v6.0.0/images/create?fromImage=quay.io%2Fcontainers%2Fpodman' // // 'podman list images' // -// curl --unix-socket /run/podman/podman.sock -v 'http://d/v5.0.0/libpod/images/json' | jq +// curl --unix-socket /run/podman/podman.sock -v 'http://d/v6.0.0/libpod/images/json' | jq // // Terms Of Service: // diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go index 9a895f0814..763948325f 100644 --- a/pkg/api/server/handler_api.go +++ b/pkg/api/server/handler_api.go @@ -10,7 +10,7 @@ import ( "net/http" "runtime" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/version" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/server/handler_panic.go b/pkg/api/server/handler_panic.go index e654c0047a..4af2f8fc41 100644 --- a/pkg/api/server/handler_panic.go +++ b/pkg/api/server/handler_panic.go @@ -7,7 +7,7 @@ import ( "net/http" "runtime" - "github.com/containers/podman/v5/pkg/api/handlers/utils" + "github.com/containers/podman/v6/pkg/api/handlers/utils" "github.com/gorilla/mux" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/server/handler_rid.go b/pkg/api/server/handler_rid.go index 1acd47823b..66ee92cccc 100644 --- a/pkg/api/server/handler_rid.go +++ b/pkg/api/server/handler_rid.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v6/pkg/api/types" "github.com/google/uuid" "github.com/gorilla/handlers" "github.com/gorilla/mux" diff --git a/pkg/api/server/register_archive.go b/pkg/api/server/register_archive.go index b21983a241..50a31c3c45 100644 --- a/pkg/api/server/register_archive.go +++ b/pkg/api/server/register_archive.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_artifacts.go b/pkg/api/server/register_artifacts.go index 123984c6fb..0c47c04231 100644 --- a/pkg/api/server/register_artifacts.go +++ b/pkg/api/server/register_artifacts.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_auth.go b/pkg/api/server/register_auth.go index d199f4cfae..2f3a04c9c1 100644 --- a/pkg/api/server/register_auth.go +++ b/pkg/api/server/register_auth.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index 03012cc2b6..27a824659b 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_distribution.go b/pkg/api/server/register_distribution.go index 90607bb99f..3a0b2b3569 100644 --- a/pkg/api/server/register_distribution.go +++ b/pkg/api/server/register_distribution.go @@ -3,7 +3,7 @@ package server import ( - "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_events.go b/pkg/api/server/register_events.go index 5f8090fc8b..7bd80c2970 100644 --- a/pkg/api/server/register_events.go +++ b/pkg/api/server/register_events.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_exec.go b/pkg/api/server/register_exec.go index f1eaaeaf01..ca9410ba9b 100644 --- a/pkg/api/server/register_exec.go +++ b/pkg/api/server/register_exec.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_generate.go b/pkg/api/server/register_generate.go index c5299a5754..d369accf56 100644 --- a/pkg/api/server/register_generate.go +++ b/pkg/api/server/register_generate.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_healthcheck.go b/pkg/api/server/register_healthcheck.go index 1535f984ce..93defa991f 100644 --- a/pkg/api/server/register_healthcheck.go +++ b/pkg/api/server/register_healthcheck.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go index 1f2c927c2d..66314ec04c 100644 --- a/pkg/api/server/register_images.go +++ b/pkg/api/server/register_images.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_info.go b/pkg/api/server/register_info.go index 6252ac57c2..8aa655ca57 100644 --- a/pkg/api/server/register_info.go +++ b/pkg/api/server/register_info.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_kube.go b/pkg/api/server/register_kube.go index 751a16d0a0..23a64ea224 100644 --- a/pkg/api/server/register_kube.go +++ b/pkg/api/server/register_kube.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_manifest.go b/pkg/api/server/register_manifest.go index ff629cf24b..d28f427cd1 100644 --- a/pkg/api/server/register_manifest.go +++ b/pkg/api/server/register_manifest.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_monitor.go b/pkg/api/server/register_monitor.go index 7bcfafa813..9cb79e1bc5 100644 --- a/pkg/api/server/register_monitor.go +++ b/pkg/api/server/register_monitor.go @@ -3,7 +3,7 @@ package server import ( - "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go index c324b4c73b..da831a6fa1 100644 --- a/pkg/api/server/register_networks.go +++ b/pkg/api/server/register_networks.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_ping.go b/pkg/api/server/register_ping.go index ee0098e9af..9576204f17 100644 --- a/pkg/api/server/register_ping.go +++ b/pkg/api/server/register_ping.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_plugins.go b/pkg/api/server/register_plugins.go index 8ea03d7376..78aa874e0d 100644 --- a/pkg/api/server/register_plugins.go +++ b/pkg/api/server/register_plugins.go @@ -3,7 +3,7 @@ package server import ( - "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_pods.go b/pkg/api/server/register_pods.go index 842e1588fc..663902ffe5 100644 --- a/pkg/api/server/register_pods.go +++ b/pkg/api/server/register_pods.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_quadlets.go b/pkg/api/server/register_quadlets.go index d923fe3544..b0a5588838 100644 --- a/pkg/api/server/register_quadlets.go +++ b/pkg/api/server/register_quadlets.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_secrets.go b/pkg/api/server/register_secrets.go index 0540abf356..01307fdc80 100644 --- a/pkg/api/server/register_secrets.go +++ b/pkg/api/server/register_secrets.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_swagger.go b/pkg/api/server/register_swagger.go index db5c6709e4..a740be7723 100644 --- a/pkg/api/server/register_swagger.go +++ b/pkg/api/server/register_swagger.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_swarm.go b/pkg/api/server/register_swarm.go index af819ebb34..cb5651cc82 100644 --- a/pkg/api/server/register_swarm.go +++ b/pkg/api/server/register_swarm.go @@ -6,7 +6,7 @@ import ( "errors" "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/utils" + "github.com/containers/podman/v6/pkg/api/handlers/utils" "github.com/gorilla/mux" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/server/register_system.go b/pkg/api/server/register_system.go index 91d31a86d3..08dbcd4d02 100644 --- a/pkg/api/server/register_system.go +++ b/pkg/api/server/register_system.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_version.go b/pkg/api/server/register_version.go index 1d1ca0eef0..1810d97fab 100644 --- a/pkg/api/server/register_version.go +++ b/pkg/api/server/register_version.go @@ -5,7 +5,7 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_volumes.go b/pkg/api/server/register_volumes.go index 6d03409d2d..dbca69e0d1 100644 --- a/pkg/api/server/register_volumes.go +++ b/pkg/api/server/register_volumes.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v5/pkg/api/handlers/compat" - "github.com/containers/podman/v5/pkg/api/handlers/libpod" + "github.com/containers/podman/v6/pkg/api/handlers/compat" + "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index b23fb46ad1..621d4a9323 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -17,13 +17,13 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/shutdown" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/api/server/idle" - "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/util/tlsutil" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/shutdown" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/api/server/idle" + "github.com/containers/podman/v6/pkg/api/types" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/util/tlsutil" "github.com/coreos/go-systemd/v22/daemon" "github.com/gorilla/mux" "github.com/gorilla/schema" diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go index c81134a52f..258f05fbcb 100644 --- a/pkg/autoupdate/autoupdate.go +++ b/pkg/autoupdate/autoupdate.go @@ -9,12 +9,12 @@ import ( "os" "sort" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/systemd" - systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/systemd" + systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" "github.com/coreos/go-systemd/v22/dbus" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/bindings/README.md b/pkg/bindings/README.md index 773de5e8ce..5bcc534e5b 100644 --- a/pkg/bindings/README.md +++ b/pkg/bindings/README.md @@ -43,7 +43,7 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings" ) func main() { @@ -74,8 +74,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/containers" ) func main() { @@ -102,8 +102,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/images" ) func main() { @@ -130,10 +130,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/specgen" ) func main() { diff --git a/pkg/bindings/artifacts/add.go b/pkg/bindings/artifacts/add.go index aa497811eb..2d06afa3f9 100644 --- a/pkg/bindings/artifacts/add.go +++ b/pkg/bindings/artifacts/add.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "github.com/containers/podman/v5/pkg/bindings" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" ) func Add(ctx context.Context, artifactName string, blobName string, artifactBlob io.Reader, options *AddOptions) (*entitiesTypes.ArtifactAddReport, error) { diff --git a/pkg/bindings/artifacts/extract.go b/pkg/bindings/artifacts/extract.go index 6e9e21a94c..07fa63b8e8 100644 --- a/pkg/bindings/artifacts/extract.go +++ b/pkg/bindings/artifacts/extract.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings" ) func Extract(ctx context.Context, artifactName string, target string, options *ExtractOptions) error { diff --git a/pkg/bindings/artifacts/inspect.go b/pkg/bindings/artifacts/inspect.go index fc4e91f730..b55c1f1d00 100644 --- a/pkg/bindings/artifacts/inspect.go +++ b/pkg/bindings/artifacts/inspect.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) func Inspect(ctx context.Context, nameOrID string, _ *InspectOptions) (*types.ArtifactInspectReport, error) { diff --git a/pkg/bindings/artifacts/list.go b/pkg/bindings/artifacts/list.go index 17dd9b7b9d..9c7925e10b 100644 --- a/pkg/bindings/artifacts/list.go +++ b/pkg/bindings/artifacts/list.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities" ) // List returns a list of artifacts in local storage. diff --git a/pkg/bindings/artifacts/pull.go b/pkg/bindings/artifacts/pull.go index 2e856ea44c..ac185d07ef 100644 --- a/pkg/bindings/artifacts/pull.go +++ b/pkg/bindings/artifacts/pull.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities" imageTypes "go.podman.io/image/v5/types" ) diff --git a/pkg/bindings/artifacts/push.go b/pkg/bindings/artifacts/push.go index 0bd7b82c59..1490ce2a34 100644 --- a/pkg/bindings/artifacts/push.go +++ b/pkg/bindings/artifacts/push.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities" imageTypes "go.podman.io/image/v5/types" ) diff --git a/pkg/bindings/artifacts/remove.go b/pkg/bindings/artifacts/remove.go index ad17c4ad18..dd5150c21a 100644 --- a/pkg/bindings/artifacts/remove.go +++ b/pkg/bindings/artifacts/remove.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities" ) // Remove removes an artifact from local storage. diff --git a/pkg/bindings/artifacts/types_add_options.go b/pkg/bindings/artifacts/types_add_options.go index 7458e61c6a..9e696bb4e2 100644 --- a/pkg/bindings/artifacts/types_add_options.go +++ b/pkg/bindings/artifacts/types_add_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_extract_options.go b/pkg/bindings/artifacts/types_extract_options.go index f8ce2ee0ee..0cc7ab9e98 100644 --- a/pkg/bindings/artifacts/types_extract_options.go +++ b/pkg/bindings/artifacts/types_extract_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_inspect_options.go b/pkg/bindings/artifacts/types_inspect_options.go index 0589341a55..f2edc83c98 100644 --- a/pkg/bindings/artifacts/types_inspect_options.go +++ b/pkg/bindings/artifacts/types_inspect_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_list_options.go b/pkg/bindings/artifacts/types_list_options.go index 5881a052bd..a167e35830 100644 --- a/pkg/bindings/artifacts/types_list_options.go +++ b/pkg/bindings/artifacts/types_list_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_pull_options.go b/pkg/bindings/artifacts/types_pull_options.go index d62d84b18b..ad2e5bce80 100644 --- a/pkg/bindings/artifacts/types_pull_options.go +++ b/pkg/bindings/artifacts/types_pull_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_push_options.go b/pkg/bindings/artifacts/types_push_options.go index 345f6baeb7..295d118a17 100644 --- a/pkg/bindings/artifacts/types_push_options.go +++ b/pkg/bindings/artifacts/types_push_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_remove_options.go b/pkg/bindings/artifacts/types_remove_options.go index 48d8046629..8b75e44f2e 100644 --- a/pkg/bindings/artifacts/types_remove_options.go +++ b/pkg/bindings/artifacts/types_remove_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go index b9aceff15b..0398da9732 100644 --- a/pkg/bindings/connection.go +++ b/pkg/bindings/connection.go @@ -18,8 +18,8 @@ import ( "time" "github.com/blang/semver/v4" - "github.com/containers/podman/v5/pkg/util/tlsutil" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/pkg/util/tlsutil" + "github.com/containers/podman/v6/version" "github.com/kevinburke/ssh_config" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/ssh" diff --git a/pkg/bindings/containers/archive.go b/pkg/bindings/containers/archive.go index f24efdf658..574fa9bff4 100644 --- a/pkg/bindings/containers/archive.go +++ b/pkg/bindings/containers/archive.go @@ -7,9 +7,9 @@ import ( "net/http" "net/url" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/copy" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/copy" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) // Stat checks if the specified path is on the container. Note that the stat diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go index a5c100854b..121775f6ff 100644 --- a/pkg/bindings/containers/attach.go +++ b/pkg/bindings/containers/attach.go @@ -16,8 +16,8 @@ import ( "strconv" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings" "github.com/moby/term" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/detach" diff --git a/pkg/bindings/containers/checkpoint.go b/pkg/bindings/containers/checkpoint.go index f9f78f35c6..4271123a4b 100644 --- a/pkg/bindings/containers/checkpoint.go +++ b/pkg/bindings/containers/checkpoint.go @@ -6,8 +6,8 @@ import ( "net/http" "os" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) // Checkpoint checkpoints the given container (identified by nameOrID). All additional diff --git a/pkg/bindings/containers/commit.go b/pkg/bindings/containers/commit.go index a14591ad37..39d691a273 100644 --- a/pkg/bindings/containers/commit.go +++ b/pkg/bindings/containers/commit.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/domain/entities/types" "go.podman.io/storage/pkg/regexp" ) diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go index b42ce58374..2868e986e3 100644 --- a/pkg/bindings/containers/containers.go +++ b/pkg/bindings/containers/containers.go @@ -9,11 +9,11 @@ import ( "net/url" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) var ( diff --git a/pkg/bindings/containers/create.go b/pkg/bindings/containers/create.go index 7b39e848d1..1f4e88fde9 100644 --- a/pkg/bindings/containers/create.go +++ b/pkg/bindings/containers/create.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/specgen" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/containers/diff.go b/pkg/bindings/containers/diff.go index c196ce0637..1b06da23c8 100644 --- a/pkg/bindings/containers/diff.go +++ b/pkg/bindings/containers/diff.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings" "go.podman.io/storage/pkg/archive" ) diff --git a/pkg/bindings/containers/exec.go b/pkg/bindings/containers/exec.go index a8419e3e29..a2c7613b01 100644 --- a/pkg/bindings/containers/exec.go +++ b/pkg/bindings/containers/exec.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" ) diff --git a/pkg/bindings/containers/healthcheck.go b/pkg/bindings/containers/healthcheck.go index 7f396fcc54..1bf4b95081 100644 --- a/pkg/bindings/containers/healthcheck.go +++ b/pkg/bindings/containers/healthcheck.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings" ) // RunHealthCheck executes the container's healthcheck and returns the health status of the diff --git a/pkg/bindings/containers/logs.go b/pkg/bindings/containers/logs.go index 8796c3a768..c8d01af05c 100644 --- a/pkg/bindings/containers/logs.go +++ b/pkg/bindings/containers/logs.go @@ -8,7 +8,7 @@ import ( "net/http" "strconv" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings" ) // Logs obtains a container's logs given the options provided. The logs are then sent to the diff --git a/pkg/bindings/containers/mount.go b/pkg/bindings/containers/mount.go index 63aaf5c117..d17330498f 100644 --- a/pkg/bindings/containers/mount.go +++ b/pkg/bindings/containers/mount.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings" ) // Mount mounts an existing container to the filesystem. It returns the path diff --git a/pkg/bindings/containers/rename.go b/pkg/bindings/containers/rename.go index 4642547bf9..3d35dcfda8 100644 --- a/pkg/bindings/containers/rename.go +++ b/pkg/bindings/containers/rename.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings" ) // Rename an existing container. diff --git a/pkg/bindings/containers/term_unix.go b/pkg/bindings/containers/term_unix.go index 900f6e23ab..4bf2f5a2d7 100644 --- a/pkg/bindings/containers/term_unix.go +++ b/pkg/bindings/containers/term_unix.go @@ -7,7 +7,7 @@ import ( "os" "os/signal" - sig "github.com/containers/podman/v5/pkg/signal" + sig "github.com/containers/podman/v6/pkg/signal" "golang.org/x/term" ) diff --git a/pkg/bindings/containers/term_windows.go b/pkg/bindings/containers/term_windows.go index ffda48b4a5..6d1e071a3a 100644 --- a/pkg/bindings/containers/term_windows.go +++ b/pkg/bindings/containers/term_windows.go @@ -5,7 +5,7 @@ import ( "os" "time" - sig "github.com/containers/podman/v5/pkg/signal" + sig "github.com/containers/podman/v6/pkg/signal" "golang.org/x/sys/windows" "golang.org/x/term" ) diff --git a/pkg/bindings/containers/types.go b/pkg/bindings/containers/types.go index 85a8248475..a4336e366a 100644 --- a/pkg/bindings/containers/types.go +++ b/pkg/bindings/containers/types.go @@ -4,7 +4,7 @@ import ( "bufio" "io" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) // LogOptions describe finer control of log content or diff --git a/pkg/bindings/containers/types_attach_options.go b/pkg/bindings/containers/types_attach_options.go index 6c272f33c5..ad4f118a54 100644 --- a/pkg/bindings/containers/types_attach_options.go +++ b/pkg/bindings/containers/types_attach_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_checkpoint_options.go b/pkg/bindings/containers/types_checkpoint_options.go index 16bd91a725..d728265706 100644 --- a/pkg/bindings/containers/types_checkpoint_options.go +++ b/pkg/bindings/containers/types_checkpoint_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_commit_options.go b/pkg/bindings/containers/types_commit_options.go index c74e2bab57..02acdb5034 100644 --- a/pkg/bindings/containers/types_commit_options.go +++ b/pkg/bindings/containers/types_commit_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_copy_options.go b/pkg/bindings/containers/types_copy_options.go index b6cf40d706..1834067956 100644 --- a/pkg/bindings/containers/types_copy_options.go +++ b/pkg/bindings/containers/types_copy_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_create_options.go b/pkg/bindings/containers/types_create_options.go index 099685ec31..d69f292534 100644 --- a/pkg/bindings/containers/types_create_options.go +++ b/pkg/bindings/containers/types_create_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_diff_options.go b/pkg/bindings/containers/types_diff_options.go index 75f7907d92..933e74968a 100644 --- a/pkg/bindings/containers/types_diff_options.go +++ b/pkg/bindings/containers/types_diff_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_execinspect_options.go b/pkg/bindings/containers/types_execinspect_options.go index e963118348..14f98121e3 100644 --- a/pkg/bindings/containers/types_execinspect_options.go +++ b/pkg/bindings/containers/types_execinspect_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_execremove_options.go b/pkg/bindings/containers/types_execremove_options.go index cfc6d8a4ef..dc8d2c9781 100644 --- a/pkg/bindings/containers/types_execremove_options.go +++ b/pkg/bindings/containers/types_execremove_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_execstart_options.go b/pkg/bindings/containers/types_execstart_options.go index bbfb4a3044..e72dde1606 100644 --- a/pkg/bindings/containers/types_execstart_options.go +++ b/pkg/bindings/containers/types_execstart_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_execstartandattach_options.go b/pkg/bindings/containers/types_execstartandattach_options.go index 1b8e48725a..df7c6745e0 100644 --- a/pkg/bindings/containers/types_execstartandattach_options.go +++ b/pkg/bindings/containers/types_execstartandattach_options.go @@ -6,7 +6,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_exists_options.go b/pkg/bindings/containers/types_exists_options.go index 91a7ceec59..8358bfa897 100644 --- a/pkg/bindings/containers/types_exists_options.go +++ b/pkg/bindings/containers/types_exists_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_export_options.go b/pkg/bindings/containers/types_export_options.go index 81c94f2b32..35e61c8e54 100644 --- a/pkg/bindings/containers/types_export_options.go +++ b/pkg/bindings/containers/types_export_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_healthcheck_options.go b/pkg/bindings/containers/types_healthcheck_options.go index e346d4822a..55d55e5298 100644 --- a/pkg/bindings/containers/types_healthcheck_options.go +++ b/pkg/bindings/containers/types_healthcheck_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_init_options.go b/pkg/bindings/containers/types_init_options.go index 2f06ae25f6..7d204ccf71 100644 --- a/pkg/bindings/containers/types_init_options.go +++ b/pkg/bindings/containers/types_init_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_inspect_options.go b/pkg/bindings/containers/types_inspect_options.go index 29fa6fedd4..4ccdcebc7f 100644 --- a/pkg/bindings/containers/types_inspect_options.go +++ b/pkg/bindings/containers/types_inspect_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_kill_options.go b/pkg/bindings/containers/types_kill_options.go index 8cb9855280..fe8efeb2bd 100644 --- a/pkg/bindings/containers/types_kill_options.go +++ b/pkg/bindings/containers/types_kill_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_list_options.go b/pkg/bindings/containers/types_list_options.go index c6a25908e0..57104db5c0 100644 --- a/pkg/bindings/containers/types_list_options.go +++ b/pkg/bindings/containers/types_list_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_log_options.go b/pkg/bindings/containers/types_log_options.go index f6efbaa9bc..4ce0860022 100644 --- a/pkg/bindings/containers/types_log_options.go +++ b/pkg/bindings/containers/types_log_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_mount_options.go b/pkg/bindings/containers/types_mount_options.go index 332f018093..373f50e768 100644 --- a/pkg/bindings/containers/types_mount_options.go +++ b/pkg/bindings/containers/types_mount_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_mountedcontainerpaths_options.go b/pkg/bindings/containers/types_mountedcontainerpaths_options.go index 8c5494face..152bba0c5a 100644 --- a/pkg/bindings/containers/types_mountedcontainerpaths_options.go +++ b/pkg/bindings/containers/types_mountedcontainerpaths_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_pause_options.go b/pkg/bindings/containers/types_pause_options.go index 14b18a87ff..b2265132a9 100644 --- a/pkg/bindings/containers/types_pause_options.go +++ b/pkg/bindings/containers/types_pause_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_prune_options.go b/pkg/bindings/containers/types_prune_options.go index 69d619d169..7504e95c3d 100644 --- a/pkg/bindings/containers/types_prune_options.go +++ b/pkg/bindings/containers/types_prune_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_remove_options.go b/pkg/bindings/containers/types_remove_options.go index e7da10a0f7..154cb8c1d4 100644 --- a/pkg/bindings/containers/types_remove_options.go +++ b/pkg/bindings/containers/types_remove_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_rename_options.go b/pkg/bindings/containers/types_rename_options.go index 5725812138..789765e698 100644 --- a/pkg/bindings/containers/types_rename_options.go +++ b/pkg/bindings/containers/types_rename_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_resizeexectty_options.go b/pkg/bindings/containers/types_resizeexectty_options.go index 0741f4eaee..c6fa5aae81 100644 --- a/pkg/bindings/containers/types_resizeexectty_options.go +++ b/pkg/bindings/containers/types_resizeexectty_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_resizetty_options.go b/pkg/bindings/containers/types_resizetty_options.go index c336f6fe8e..ab2fdc3f4d 100644 --- a/pkg/bindings/containers/types_resizetty_options.go +++ b/pkg/bindings/containers/types_resizetty_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_restart_options.go b/pkg/bindings/containers/types_restart_options.go index e27e881adc..b2ea9e13e1 100644 --- a/pkg/bindings/containers/types_restart_options.go +++ b/pkg/bindings/containers/types_restart_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_restore_options.go b/pkg/bindings/containers/types_restore_options.go index 74348e0545..f5212db7d0 100644 --- a/pkg/bindings/containers/types_restore_options.go +++ b/pkg/bindings/containers/types_restore_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_shouldrestart_options.go b/pkg/bindings/containers/types_shouldrestart_options.go index e968731b04..b363ac12e3 100644 --- a/pkg/bindings/containers/types_shouldrestart_options.go +++ b/pkg/bindings/containers/types_shouldrestart_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_start_options.go b/pkg/bindings/containers/types_start_options.go index fb77b421cd..f5c722805a 100644 --- a/pkg/bindings/containers/types_start_options.go +++ b/pkg/bindings/containers/types_start_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_stats_options.go b/pkg/bindings/containers/types_stats_options.go index fbae6bd49f..ae9a8d6a76 100644 --- a/pkg/bindings/containers/types_stats_options.go +++ b/pkg/bindings/containers/types_stats_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_stop_options.go b/pkg/bindings/containers/types_stop_options.go index eea280e3fd..1c75c08cc4 100644 --- a/pkg/bindings/containers/types_stop_options.go +++ b/pkg/bindings/containers/types_stop_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_top_options.go b/pkg/bindings/containers/types_top_options.go index cfd21ecc3c..57015b5c74 100644 --- a/pkg/bindings/containers/types_top_options.go +++ b/pkg/bindings/containers/types_top_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_unmount_options.go b/pkg/bindings/containers/types_unmount_options.go index 0752556a00..a31d7fe1c2 100644 --- a/pkg/bindings/containers/types_unmount_options.go +++ b/pkg/bindings/containers/types_unmount_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_unpause_options.go b/pkg/bindings/containers/types_unpause_options.go index 2f91a7d33a..0ab0a0ee07 100644 --- a/pkg/bindings/containers/types_unpause_options.go +++ b/pkg/bindings/containers/types_unpause_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_wait_options.go b/pkg/bindings/containers/types_wait_options.go index fcb9a91407..1643a4fd59 100644 --- a/pkg/bindings/containers/types_wait_options.go +++ b/pkg/bindings/containers/types_wait_options.go @@ -4,8 +4,8 @@ package containers import ( "net/url" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/update.go b/pkg/bindings/containers/update.go index 574d602b34..e8405b15e8 100644 --- a/pkg/bindings/containers/update.go +++ b/pkg/bindings/containers/update.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/errors.go b/pkg/bindings/errors.go index 660ee9e05c..83e7d41c09 100644 --- a/pkg/bindings/errors.go +++ b/pkg/bindings/errors.go @@ -7,7 +7,7 @@ import ( "io" "github.com/blang/semver/v4" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/errorhandling" ) var ( diff --git a/pkg/bindings/generate/generate.go b/pkg/bindings/generate/generate.go index 59a5cd4cbf..ba71f20ac2 100644 --- a/pkg/bindings/generate/generate.go +++ b/pkg/bindings/generate/generate.go @@ -6,8 +6,8 @@ import ( "net/http" "strconv" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) func Systemd(ctx context.Context, nameOrID string, options *SystemdOptions) (*types.GenerateSystemdReport, error) { diff --git a/pkg/bindings/generate/types_kube_options.go b/pkg/bindings/generate/types_kube_options.go index 4770a7b617..43ba4a8149 100644 --- a/pkg/bindings/generate/types_kube_options.go +++ b/pkg/bindings/generate/types_kube_options.go @@ -4,7 +4,7 @@ package generate import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/generate/types_systemd_options.go b/pkg/bindings/generate/types_systemd_options.go index 2069e39ff3..6eed03a883 100644 --- a/pkg/bindings/generate/types_systemd_options.go +++ b/pkg/bindings/generate/types_systemd_options.go @@ -4,7 +4,7 @@ package generate import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/generator/generator.go b/pkg/bindings/generator/generator.go index 5d7e2a6de2..52230a7767 100644 --- a/pkg/bindings/generator/generator.go +++ b/pkg/bindings/generator/generator.go @@ -81,7 +81,7 @@ func main() { } // always add reflect - imports := []string{"\"reflect\"", "\"github.com/containers/podman/v5/pkg/bindings/internal/util\""} + imports := []string{"\"reflect\"", "\"github.com/containers/podman/v6/pkg/bindings/internal/util\""} for _, imp := range f.Imports { imports = append(imports, imp.Path.Value) } diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index fa220d9b16..ed64366d30 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -19,13 +19,13 @@ import ( "github.com/blang/semver/v4" "github.com/containers/buildah/define" - "github.com/containers/podman/v5/internal/remote_build_helpers" - ldefine "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/internal/remote_build_helpers" + ldefine "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/util" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/go-units" "github.com/hashicorp/go-multierror" diff --git a/pkg/bindings/images/diff.go b/pkg/bindings/images/diff.go index eaa576c60f..77a1425e3b 100644 --- a/pkg/bindings/images/diff.go +++ b/pkg/bindings/images/diff.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings" "go.podman.io/storage/pkg/archive" ) diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go index 40201be06c..35a057779d 100644 --- a/pkg/bindings/images/images.go +++ b/pkg/bindings/images/images.go @@ -9,11 +9,11 @@ import ( "net/url" "strconv" - handlersTypes "github.com/containers/podman/v5/pkg/api/handlers/types" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/entities/types" + handlersTypes "github.com/containers/podman/v6/pkg/api/handlers/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/entities/types" imageTypes "go.podman.io/image/v5/types" ) diff --git a/pkg/bindings/images/pull.go b/pkg/bindings/images/pull.go index f65f654e04..5f3694d4f8 100644 --- a/pkg/bindings/images/pull.go +++ b/pkg/bindings/images/pull.go @@ -10,10 +10,10 @@ import ( "os" "strconv" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/errorhandling" imgTypes "go.podman.io/image/v5/types" ) diff --git a/pkg/bindings/images/push.go b/pkg/bindings/images/push.go index 292fb8ce97..46dd2973a5 100644 --- a/pkg/bindings/images/push.go +++ b/pkg/bindings/images/push.go @@ -10,9 +10,9 @@ import ( "os" "strconv" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" imageTypes "go.podman.io/image/v5/types" ) diff --git a/pkg/bindings/images/rm.go b/pkg/bindings/images/rm.go index 4fd35c5551..24e809427a 100644 --- a/pkg/bindings/images/rm.go +++ b/pkg/bindings/images/rm.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - handlersTypes "github.com/containers/podman/v5/pkg/api/handlers/types" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/errorhandling" + handlersTypes "github.com/containers/podman/v6/pkg/api/handlers/types" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/errorhandling" ) // Remove removes one or more images from the local storage. Use optional force option to remove an diff --git a/pkg/bindings/images/types.go b/pkg/bindings/images/types.go index 0db6d6f027..6308fbe5e8 100644 --- a/pkg/bindings/images/types.go +++ b/pkg/bindings/images/types.go @@ -3,7 +3,7 @@ package images import ( "io" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) // RemoveOptions are optional options for image removal diff --git a/pkg/bindings/images/types_diff_options.go b/pkg/bindings/images/types_diff_options.go index 18bcf95264..e0640c7e1e 100644 --- a/pkg/bindings/images/types_diff_options.go +++ b/pkg/bindings/images/types_diff_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_exists_options.go b/pkg/bindings/images/types_exists_options.go index e31138d439..f3a962a052 100644 --- a/pkg/bindings/images/types_exists_options.go +++ b/pkg/bindings/images/types_exists_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_export_options.go b/pkg/bindings/images/types_export_options.go index 0cc3da8c87..59fabbb2d6 100644 --- a/pkg/bindings/images/types_export_options.go +++ b/pkg/bindings/images/types_export_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_get_options.go b/pkg/bindings/images/types_get_options.go index 84295a75f5..f8da136b5b 100644 --- a/pkg/bindings/images/types_get_options.go +++ b/pkg/bindings/images/types_get_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_history_options.go b/pkg/bindings/images/types_history_options.go index 3dc43cc421..488e7e0e25 100644 --- a/pkg/bindings/images/types_history_options.go +++ b/pkg/bindings/images/types_history_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_import_options.go b/pkg/bindings/images/types_import_options.go index aafb8de70f..9b9812d3c7 100644 --- a/pkg/bindings/images/types_import_options.go +++ b/pkg/bindings/images/types_import_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_list_options.go b/pkg/bindings/images/types_list_options.go index 4c378e1e83..787fd96ad7 100644 --- a/pkg/bindings/images/types_list_options.go +++ b/pkg/bindings/images/types_list_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_load_options.go b/pkg/bindings/images/types_load_options.go index 470e4293b4..facfc82c72 100644 --- a/pkg/bindings/images/types_load_options.go +++ b/pkg/bindings/images/types_load_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_prune_options.go b/pkg/bindings/images/types_prune_options.go index bbd12a1693..842ac1d478 100644 --- a/pkg/bindings/images/types_prune_options.go +++ b/pkg/bindings/images/types_prune_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_pull_options.go b/pkg/bindings/images/types_pull_options.go index 7a10a5c391..33336af4b4 100644 --- a/pkg/bindings/images/types_pull_options.go +++ b/pkg/bindings/images/types_pull_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_push_options.go b/pkg/bindings/images/types_push_options.go index 686636cdb2..750422763c 100644 --- a/pkg/bindings/images/types_push_options.go +++ b/pkg/bindings/images/types_push_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_remove_options.go b/pkg/bindings/images/types_remove_options.go index 68d24149c0..f41b729800 100644 --- a/pkg/bindings/images/types_remove_options.go +++ b/pkg/bindings/images/types_remove_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_scp_options.go b/pkg/bindings/images/types_scp_options.go index e92b3dc035..0b0c78a95d 100644 --- a/pkg/bindings/images/types_scp_options.go +++ b/pkg/bindings/images/types_scp_options.go @@ -3,7 +3,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // ToParams formats struct fields to be passed to API service diff --git a/pkg/bindings/images/types_search_options.go b/pkg/bindings/images/types_search_options.go index 7da357ba56..7b681241c0 100644 --- a/pkg/bindings/images/types_search_options.go +++ b/pkg/bindings/images/types_search_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_tag_options.go b/pkg/bindings/images/types_tag_options.go index 39582afd61..f53a12ca7d 100644 --- a/pkg/bindings/images/types_tag_options.go +++ b/pkg/bindings/images/types_tag_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_tree_options.go b/pkg/bindings/images/types_tree_options.go index f87517cb0b..90b0037fe1 100644 --- a/pkg/bindings/images/types_tree_options.go +++ b/pkg/bindings/images/types_tree_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_untag_options.go b/pkg/bindings/images/types_untag_options.go index 4fdb689ad0..dcfd8bc85b 100644 --- a/pkg/bindings/images/types_untag_options.go +++ b/pkg/bindings/images/types_untag_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/kube/kube.go b/pkg/bindings/kube/kube.go index f11e0a57e5..215f656efc 100644 --- a/pkg/bindings/kube/kube.go +++ b/pkg/bindings/kube/kube.go @@ -8,10 +8,10 @@ import ( "os" "strconv" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/generate" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/generate" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" ) diff --git a/pkg/bindings/kube/types_apply_options.go b/pkg/bindings/kube/types_apply_options.go index 9ec4a82156..936b1f2aa4 100644 --- a/pkg/bindings/kube/types_apply_options.go +++ b/pkg/bindings/kube/types_apply_options.go @@ -4,7 +4,7 @@ package kube import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/kube/types_down_options.go b/pkg/bindings/kube/types_down_options.go index 58b85de0d6..7daa1c5aa2 100644 --- a/pkg/bindings/kube/types_down_options.go +++ b/pkg/bindings/kube/types_down_options.go @@ -4,7 +4,7 @@ package kube import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/kube/types_play_options.go b/pkg/bindings/kube/types_play_options.go index 2323df08f0..0afe322033 100644 --- a/pkg/bindings/kube/types_play_options.go +++ b/pkg/bindings/kube/types_play_options.go @@ -5,7 +5,7 @@ import ( "net" "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/manifests.go b/pkg/bindings/manifests/manifests.go index c8cd2c3f85..abd3c792b3 100644 --- a/pkg/bindings/manifests/manifests.go +++ b/pkg/bindings/manifests/manifests.go @@ -16,11 +16,11 @@ import ( "strings" "sync" - "github.com/containers/podman/v5/pkg/auth" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/images" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/auth" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/images" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/errorhandling" jsoniter "github.com/json-iterator/go" "go.podman.io/common/libimage/define" "go.podman.io/image/v5/manifest" diff --git a/pkg/bindings/manifests/types_add_options.go b/pkg/bindings/manifests/types_add_options.go index 47892d7936..a7f602890c 100644 --- a/pkg/bindings/manifests/types_add_options.go +++ b/pkg/bindings/manifests/types_add_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_addartifact_options.go b/pkg/bindings/manifests/types_addartifact_options.go index 3b1c2804ec..c1b354e892 100644 --- a/pkg/bindings/manifests/types_addartifact_options.go +++ b/pkg/bindings/manifests/types_addartifact_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_create_options.go b/pkg/bindings/manifests/types_create_options.go index 758010716c..6c610f66e6 100644 --- a/pkg/bindings/manifests/types_create_options.go +++ b/pkg/bindings/manifests/types_create_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_exists_options.go b/pkg/bindings/manifests/types_exists_options.go index 82ace8c3cb..a4f9fb2ec0 100644 --- a/pkg/bindings/manifests/types_exists_options.go +++ b/pkg/bindings/manifests/types_exists_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_inspect_options.go b/pkg/bindings/manifests/types_inspect_options.go index 062851374b..a994854288 100644 --- a/pkg/bindings/manifests/types_inspect_options.go +++ b/pkg/bindings/manifests/types_inspect_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_modify_options.go b/pkg/bindings/manifests/types_modify_options.go index 4ae71567f4..024666a64e 100644 --- a/pkg/bindings/manifests/types_modify_options.go +++ b/pkg/bindings/manifests/types_modify_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_remove_options.go b/pkg/bindings/manifests/types_remove_options.go index 065e9f96b7..f224aaf995 100644 --- a/pkg/bindings/manifests/types_remove_options.go +++ b/pkg/bindings/manifests/types_remove_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/network.go b/pkg/bindings/network/network.go index d563b1fcf2..b8c40c60fa 100644 --- a/pkg/bindings/network/network.go +++ b/pkg/bindings/network/network.go @@ -6,8 +6,8 @@ import ( "net/url" "strings" - "github.com/containers/podman/v5/pkg/bindings" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" "go.podman.io/common/libnetwork/types" ) diff --git a/pkg/bindings/network/types_create_options.go b/pkg/bindings/network/types_create_options.go index 2bfa13a117..be6443d2a9 100644 --- a/pkg/bindings/network/types_create_options.go +++ b/pkg/bindings/network/types_create_options.go @@ -5,7 +5,7 @@ import ( "net" "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_disconnect_options.go b/pkg/bindings/network/types_disconnect_options.go index 987138f504..8971186544 100644 --- a/pkg/bindings/network/types_disconnect_options.go +++ b/pkg/bindings/network/types_disconnect_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_exists_options.go b/pkg/bindings/network/types_exists_options.go index 72c936a6df..378e7b6f6e 100644 --- a/pkg/bindings/network/types_exists_options.go +++ b/pkg/bindings/network/types_exists_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_extracreate_options.go b/pkg/bindings/network/types_extracreate_options.go index 6f74842cd9..68e769812d 100644 --- a/pkg/bindings/network/types_extracreate_options.go +++ b/pkg/bindings/network/types_extracreate_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_inspect_options.go b/pkg/bindings/network/types_inspect_options.go index d9cc782bca..3243241629 100644 --- a/pkg/bindings/network/types_inspect_options.go +++ b/pkg/bindings/network/types_inspect_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_list_options.go b/pkg/bindings/network/types_list_options.go index b1f214cdd7..6aa4272de6 100644 --- a/pkg/bindings/network/types_list_options.go +++ b/pkg/bindings/network/types_list_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_prune_options.go b/pkg/bindings/network/types_prune_options.go index 6036648e94..2ae3a58c55 100644 --- a/pkg/bindings/network/types_prune_options.go +++ b/pkg/bindings/network/types_prune_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_remove_options.go b/pkg/bindings/network/types_remove_options.go index 426fdb1c4b..efbd19942f 100644 --- a/pkg/bindings/network/types_remove_options.go +++ b/pkg/bindings/network/types_remove_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_update_options.go b/pkg/bindings/network/types_update_options.go index 424d067133..4bafe08fff 100644 --- a/pkg/bindings/network/types_update_options.go +++ b/pkg/bindings/network/types_update_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/play/play.go b/pkg/bindings/play/play.go index acc39d9724..bf3699774d 100644 --- a/pkg/bindings/play/play.go +++ b/pkg/bindings/play/play.go @@ -4,8 +4,8 @@ import ( "context" "io" - "github.com/containers/podman/v5/pkg/bindings/kube" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings/kube" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) type KubeOptions = kube.PlayOptions diff --git a/pkg/bindings/pods/pods.go b/pkg/bindings/pods/pods.go index 200d579b7e..c85033d5db 100644 --- a/pkg/bindings/pods/pods.go +++ b/pkg/bindings/pods/pods.go @@ -6,10 +6,10 @@ import ( "net/url" "strings" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/bindings" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/bindings" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/errorhandling" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/pods/types_create_options.go b/pkg/bindings/pods/types_create_options.go index b9ae5122f9..aafe90acff 100644 --- a/pkg/bindings/pods/types_create_options.go +++ b/pkg/bindings/pods/types_create_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_exists_options.go b/pkg/bindings/pods/types_exists_options.go index 3dd4f0a004..0088929e58 100644 --- a/pkg/bindings/pods/types_exists_options.go +++ b/pkg/bindings/pods/types_exists_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_inspect_options.go b/pkg/bindings/pods/types_inspect_options.go index 75c501a5b6..cec82559da 100644 --- a/pkg/bindings/pods/types_inspect_options.go +++ b/pkg/bindings/pods/types_inspect_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_kill_options.go b/pkg/bindings/pods/types_kill_options.go index 489800c6ca..fefec07799 100644 --- a/pkg/bindings/pods/types_kill_options.go +++ b/pkg/bindings/pods/types_kill_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_list_options.go b/pkg/bindings/pods/types_list_options.go index 038b753b63..fea09c373d 100644 --- a/pkg/bindings/pods/types_list_options.go +++ b/pkg/bindings/pods/types_list_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_pause_options.go b/pkg/bindings/pods/types_pause_options.go index 0bee2b0fd9..05b813155c 100644 --- a/pkg/bindings/pods/types_pause_options.go +++ b/pkg/bindings/pods/types_pause_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_prune_options.go b/pkg/bindings/pods/types_prune_options.go index dac0417f79..426a6c4c78 100644 --- a/pkg/bindings/pods/types_prune_options.go +++ b/pkg/bindings/pods/types_prune_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_remove_options.go b/pkg/bindings/pods/types_remove_options.go index a0bbd57daa..43b7541923 100644 --- a/pkg/bindings/pods/types_remove_options.go +++ b/pkg/bindings/pods/types_remove_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_restart_options.go b/pkg/bindings/pods/types_restart_options.go index 957bab982b..5803038df7 100644 --- a/pkg/bindings/pods/types_restart_options.go +++ b/pkg/bindings/pods/types_restart_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_start_options.go b/pkg/bindings/pods/types_start_options.go index ec971037b8..d8fd011d45 100644 --- a/pkg/bindings/pods/types_start_options.go +++ b/pkg/bindings/pods/types_start_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_stats_options.go b/pkg/bindings/pods/types_stats_options.go index f3e662b199..7a78a0692e 100644 --- a/pkg/bindings/pods/types_stats_options.go +++ b/pkg/bindings/pods/types_stats_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_stop_options.go b/pkg/bindings/pods/types_stop_options.go index e635780a2b..0cb64ce17f 100644 --- a/pkg/bindings/pods/types_stop_options.go +++ b/pkg/bindings/pods/types_stop_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_top_options.go b/pkg/bindings/pods/types_top_options.go index c8e415ec60..1850a4248d 100644 --- a/pkg/bindings/pods/types_top_options.go +++ b/pkg/bindings/pods/types_top_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_unpause_options.go b/pkg/bindings/pods/types_unpause_options.go index 01f316d01a..840ef6270c 100644 --- a/pkg/bindings/pods/types_unpause_options.go +++ b/pkg/bindings/pods/types_unpause_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/secrets/secrets.go b/pkg/bindings/secrets/secrets.go index 49313f94c9..622cc93bb7 100644 --- a/pkg/bindings/secrets/secrets.go +++ b/pkg/bindings/secrets/secrets.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "github.com/containers/podman/v5/pkg/bindings" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" ) // List returns information about existing secrets in the form of a slice. diff --git a/pkg/bindings/secrets/types_create_options.go b/pkg/bindings/secrets/types_create_options.go index 35b14e3bc7..cd180b4f77 100644 --- a/pkg/bindings/secrets/types_create_options.go +++ b/pkg/bindings/secrets/types_create_options.go @@ -4,7 +4,7 @@ package secrets import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/secrets/types_inspect_options.go b/pkg/bindings/secrets/types_inspect_options.go index 0456ff77a4..e89e6d085c 100644 --- a/pkg/bindings/secrets/types_inspect_options.go +++ b/pkg/bindings/secrets/types_inspect_options.go @@ -4,7 +4,7 @@ package secrets import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/secrets/types_list_options.go b/pkg/bindings/secrets/types_list_options.go index 1dd120fa67..20874e3c8a 100644 --- a/pkg/bindings/secrets/types_list_options.go +++ b/pkg/bindings/secrets/types_list_options.go @@ -4,7 +4,7 @@ package secrets import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/secrets/types_remove_options.go b/pkg/bindings/secrets/types_remove_options.go index 5dff2f91ca..75c8b48229 100644 --- a/pkg/bindings/secrets/types_remove_options.go +++ b/pkg/bindings/secrets/types_remove_options.go @@ -4,7 +4,7 @@ package secrets import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/info.go b/pkg/bindings/system/info.go index bf70481360..bd197c5f9d 100644 --- a/pkg/bindings/system/info.go +++ b/pkg/bindings/system/info.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings" ) // Info returns information about the libpod environment and its stores diff --git a/pkg/bindings/system/system.go b/pkg/bindings/system/system.go index b2eacd4a69..c4defe1472 100644 --- a/pkg/bindings/system/system.go +++ b/pkg/bindings/system/system.go @@ -7,9 +7,9 @@ import ( "net/http" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/bindings/system/types_check_options.go b/pkg/bindings/system/types_check_options.go index 374f142d80..7aafb315aa 100644 --- a/pkg/bindings/system/types_check_options.go +++ b/pkg/bindings/system/types_check_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_disk_options.go b/pkg/bindings/system/types_disk_options.go index 0acb3c55b2..46be0d2a98 100644 --- a/pkg/bindings/system/types_disk_options.go +++ b/pkg/bindings/system/types_disk_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_events_options.go b/pkg/bindings/system/types_events_options.go index 3a8920cf54..502b656c77 100644 --- a/pkg/bindings/system/types_events_options.go +++ b/pkg/bindings/system/types_events_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_info_options.go b/pkg/bindings/system/types_info_options.go index dce750c4c7..f254d18703 100644 --- a/pkg/bindings/system/types_info_options.go +++ b/pkg/bindings/system/types_info_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_prune_options.go b/pkg/bindings/system/types_prune_options.go index 4e39c0b18a..8bedc5b681 100644 --- a/pkg/bindings/system/types_prune_options.go +++ b/pkg/bindings/system/types_prune_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_version_options.go b/pkg/bindings/system/types_version_options.go index d13f24392c..312e7ed04e 100644 --- a/pkg/bindings/system/types_version_options.go +++ b/pkg/bindings/system/types_version_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/test/api_response_test.go b/pkg/bindings/test/api_response_test.go index 889d2c6147..ac2502f4fe 100644 --- a/pkg/bindings/test/api_response_test.go +++ b/pkg/bindings/test/api_response_test.go @@ -7,9 +7,9 @@ import ( "io" "net/http" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/entities/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/bindings/test/attach_test.go b/pkg/bindings/test/attach_test.go index 6d6ac3bdb7..55fb245940 100644 --- a/pkg/bindings/test/attach_test.go +++ b/pkg/bindings/test/attach_test.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/auth_test.go b/pkg/bindings/test/auth_test.go index 0df962bdc0..a568504f91 100644 --- a/pkg/bindings/test/auth_test.go +++ b/pkg/bindings/test/auth_test.go @@ -4,8 +4,8 @@ import ( "os" "time" - podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" - "github.com/containers/podman/v5/pkg/bindings/images" + podmanRegistry "github.com/containers/podman/v6/hack/podman-registry-go" + "github.com/containers/podman/v6/pkg/bindings/images" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index 046efffda1..1916ee0446 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - . "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + . "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/specgen" "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/connection_test.go b/pkg/bindings/test/connection_test.go index 73d8e52f1f..751d768d2e 100644 --- a/pkg/bindings/test/connection_test.go +++ b/pkg/bindings/test/connection_test.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/system" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/system" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go index 95739e1958..4d07deb4a5 100644 --- a/pkg/bindings/test/containers_test.go +++ b/pkg/bindings/test/containers_test.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/create_test.go b/pkg/bindings/test/create_test.go index c8818454f5..3e0a0440b3 100644 --- a/pkg/bindings/test/create_test.go +++ b/pkg/bindings/test/create_test.go @@ -3,8 +3,8 @@ package bindings_test import ( "time" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/exec_test.go b/pkg/bindings/test/exec_test.go index a0081e8a88..ca354b3cad 100644 --- a/pkg/bindings/test/exec_test.go +++ b/pkg/bindings/test/exec_test.go @@ -3,8 +3,8 @@ package bindings_test import ( "time" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/bindings/containers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/generator_test.go b/pkg/bindings/test/generator_test.go index b5c1ea10bd..b8f0c15170 100644 --- a/pkg/bindings/test/generator_test.go +++ b/pkg/bindings/test/generator_test.go @@ -1,7 +1,7 @@ package bindings_test import ( - "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/containers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go index 42a1dc2db6..0432c38fcf 100644 --- a/pkg/bindings/test/images_test.go +++ b/pkg/bindings/test/images_test.go @@ -8,12 +8,12 @@ import ( "path/filepath" "time" - podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/domain/entities" + podmanRegistry "github.com/containers/podman/v6/hack/podman-registry-go" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/domain/entities" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/info_test.go b/pkg/bindings/test/info_test.go index 7fc7f4c32d..a0ee5710f0 100644 --- a/pkg/bindings/test/info_test.go +++ b/pkg/bindings/test/info_test.go @@ -4,10 +4,10 @@ import ( "runtime" "time" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/bindings/system" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/bindings/system" + "github.com/containers/podman/v6/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/manifests_test.go b/pkg/bindings/test/manifests_test.go index 6648d11ec1..4a263e1761 100644 --- a/pkg/bindings/test/manifests_test.go +++ b/pkg/bindings/test/manifests_test.go @@ -6,10 +6,10 @@ import ( "net/http" "time" - podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/bindings/manifests" + podmanRegistry "github.com/containers/podman/v6/hack/podman-registry-go" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/bindings/manifests" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/networks_test.go b/pkg/bindings/test/networks_test.go index 10a50bd6d6..d09df45d1b 100644 --- a/pkg/bindings/test/networks_test.go +++ b/pkg/bindings/test/networks_test.go @@ -7,9 +7,9 @@ import ( "slices" "time" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/network" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/network" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go index f621379114..114ec7e9c4 100644 --- a/pkg/bindings/test/pods_test.go +++ b/pkg/bindings/test/pods_test.go @@ -7,13 +7,13 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/pods" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/pods" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/resource_test.go b/pkg/bindings/test/resource_test.go index 1afca1d788..959822dfb1 100644 --- a/pkg/bindings/test/resource_test.go +++ b/pkg/bindings/test/resource_test.go @@ -13,11 +13,11 @@ import ( "strconv" "syscall" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/bindings/pods" - "github.com/containers/podman/v5/pkg/bindings/system" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/bindings/pods" + "github.com/containers/podman/v6/pkg/bindings/system" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/secrets_test.go b/pkg/bindings/test/secrets_test.go index 68a5b2d496..134566dc43 100644 --- a/pkg/bindings/test/secrets_test.go +++ b/pkg/bindings/test/secrets_test.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/secrets" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/secrets" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/system_test.go b/pkg/bindings/test/system_test.go index f55752f592..47691b7817 100644 --- a/pkg/bindings/test/system_test.go +++ b/pkg/bindings/test/system_test.go @@ -4,12 +4,12 @@ import ( "sync" "time" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/pods" - "github.com/containers/podman/v5/pkg/bindings/system" - "github.com/containers/podman/v5/pkg/bindings/volumes" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/pods" + "github.com/containers/podman/v6/pkg/bindings/system" + "github.com/containers/podman/v6/pkg/bindings/volumes" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/types_test.go b/pkg/bindings/test/types_test.go index 1de29279e2..3cdd0eb14c 100644 --- a/pkg/bindings/test/types_test.go +++ b/pkg/bindings/test/types_test.go @@ -3,9 +3,9 @@ package bindings_test import ( "bytes" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/bindings/kube" - "github.com/containers/podman/v5/pkg/bindings/manifests" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/bindings/kube" + "github.com/containers/podman/v6/pkg/bindings/manifests" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/bindings/test/volumes_test.go b/pkg/bindings/test/volumes_test.go index cb7cc84bed..ba519b9bfa 100644 --- a/pkg/bindings/test/volumes_test.go +++ b/pkg/bindings/test/volumes_test.go @@ -7,11 +7,11 @@ import ( "slices" "time" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/volumes" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/volumes" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/volumes/types_create_options.go b/pkg/bindings/volumes/types_create_options.go index 98ac9d746a..34784dc214 100644 --- a/pkg/bindings/volumes/types_create_options.go +++ b/pkg/bindings/volumes/types_create_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_exists_options.go b/pkg/bindings/volumes/types_exists_options.go index 70f5f5cb05..21b970dd94 100644 --- a/pkg/bindings/volumes/types_exists_options.go +++ b/pkg/bindings/volumes/types_exists_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_inspect_options.go b/pkg/bindings/volumes/types_inspect_options.go index 913faa5e99..ba8951ae0c 100644 --- a/pkg/bindings/volumes/types_inspect_options.go +++ b/pkg/bindings/volumes/types_inspect_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_list_options.go b/pkg/bindings/volumes/types_list_options.go index 2db1d37ae4..b59205c9c8 100644 --- a/pkg/bindings/volumes/types_list_options.go +++ b/pkg/bindings/volumes/types_list_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_prune_options.go b/pkg/bindings/volumes/types_prune_options.go index ad4346a89d..c89bb6ff08 100644 --- a/pkg/bindings/volumes/types_prune_options.go +++ b/pkg/bindings/volumes/types_prune_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_remove_options.go b/pkg/bindings/volumes/types_remove_options.go index 577633e2b6..292da60a42 100644 --- a/pkg/bindings/volumes/types_remove_options.go +++ b/pkg/bindings/volumes/types_remove_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v5/pkg/bindings/internal/util" + "github.com/containers/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/volumes.go b/pkg/bindings/volumes/volumes.go index bc82b09c66..01c9c3b243 100644 --- a/pkg/bindings/volumes/volumes.go +++ b/pkg/bindings/volumes/volumes.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index 6e0a82899f..98493c465d 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -9,13 +9,13 @@ import ( "os" metadata "github.com/checkpoint-restore/checkpointctl/lib" - "github.com/containers/podman/v5/libpod" - ann "github.com/containers/podman/v5/pkg/annotations" - "github.com/containers/podman/v5/pkg/checkpoint/crutils" - "github.com/containers/podman/v5/pkg/criu" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgen/generate" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/libpod" + ann "github.com/containers/podman/v6/pkg/annotations" + "github.com/containers/podman/v6/pkg/checkpoint/crutils" + "github.com/containers/podman/v6/pkg/criu" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgen/generate" + "github.com/containers/podman/v6/pkg/specgenutil" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/copy/fileinfo.go b/pkg/copy/fileinfo.go index 01a9dae796..5dc3e287e0 100644 --- a/pkg/copy/fileinfo.go +++ b/pkg/copy/fileinfo.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) // XDockerContainerPathStatHeader is the *key* in http headers pointing to the diff --git a/pkg/domain/entities/artifact.go b/pkg/domain/entities/artifact.go index 00521dc5ef..55917fa82b 100644 --- a/pkg/domain/entities/artifact.go +++ b/pkg/domain/entities/artifact.go @@ -4,7 +4,7 @@ import ( "io" encconfig "github.com/containers/ocicrypt/config" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" libartifactTypes "go.podman.io/common/pkg/libartifact/types" "go.podman.io/image/v5/types" ) diff --git a/pkg/domain/entities/container_ps.go b/pkg/domain/entities/container_ps.go index b408eec06d..81f166ea9a 100644 --- a/pkg/domain/entities/container_ps.go +++ b/pkg/domain/entities/container_ps.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) // ExternalContainerFilter is a function to determine whether a container list is included diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index ad89b0f417..b0219ce87b 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -6,9 +6,9 @@ import ( "os" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/specgen" nettypes "go.podman.io/common/libnetwork/types" imageTypes "go.podman.io/image/v5/types" "go.podman.io/storage/pkg/archive" diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go index d81d5c1321..004d6112d7 100644 --- a/pkg/domain/entities/engine_container.go +++ b/pkg/domain/entities/engine_container.go @@ -4,10 +4,10 @@ import ( "context" "io" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/specgen" netTypes "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" ) diff --git a/pkg/domain/entities/engine_image.go b/pkg/domain/entities/engine_image.go index 0e75ddcb9b..bb69a87aad 100644 --- a/pkg/domain/entities/engine_image.go +++ b/pkg/domain/entities/engine_image.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/entities/reports" "go.podman.io/common/libimage/define" "go.podman.io/common/pkg/config" ) diff --git a/pkg/domain/entities/events.go b/pkg/domain/entities/events.go index d9c7625533..695cf913e5 100644 --- a/pkg/domain/entities/events.go +++ b/pkg/domain/entities/events.go @@ -4,8 +4,8 @@ import ( "strconv" "time" - libpodEvents "github.com/containers/podman/v5/libpod/events" - types "github.com/containers/podman/v5/pkg/domain/entities/types" + libpodEvents "github.com/containers/podman/v6/libpod/events" + types "github.com/containers/podman/v6/pkg/domain/entities/types" dockerEvents "github.com/docker/docker/api/types/events" ) diff --git a/pkg/domain/entities/generate.go b/pkg/domain/entities/generate.go index 8a54ce2905..6596b9a4fc 100644 --- a/pkg/domain/entities/generate.go +++ b/pkg/domain/entities/generate.go @@ -1,7 +1,7 @@ package entities import ( - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) // GenerateSystemdOptions control the generation of systemd unit files. diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 491f153277..d2324e72d1 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -5,7 +5,7 @@ import ( "net/url" encconfig "github.com/containers/ocicrypt/config" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/signature/signer" "go.podman.io/image/v5/types" diff --git a/pkg/domain/entities/machine.go b/pkg/domain/entities/machine.go index 1d2e45f321..1390437db8 100644 --- a/pkg/domain/entities/machine.go +++ b/pkg/domain/entities/machine.go @@ -1,6 +1,6 @@ package entities -import "github.com/containers/podman/v5/libpod/define" +import "github.com/containers/podman/v6/libpod/define" type ListReporter struct { Name string diff --git a/pkg/domain/entities/manifest.go b/pkg/domain/entities/manifest.go index b5e1eb2403..1027174403 100644 --- a/pkg/domain/entities/manifest.go +++ b/pkg/domain/entities/manifest.go @@ -1,7 +1,7 @@ package entities import ( - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" "go.podman.io/image/v5/types" ) diff --git a/pkg/domain/entities/network.go b/pkg/domain/entities/network.go index 74b6af5c83..4a32a21205 100644 --- a/pkg/domain/entities/network.go +++ b/pkg/domain/entities/network.go @@ -3,7 +3,7 @@ package entities import ( "net" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" ) // NetworkListOptions describes options for listing networks in cli diff --git a/pkg/domain/entities/play.go b/pkg/domain/entities/play.go index 9df0dbda46..1e434378ca 100644 --- a/pkg/domain/entities/play.go +++ b/pkg/domain/entities/play.go @@ -3,7 +3,7 @@ package entities import ( "net" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" "go.podman.io/image/v5/types" ) diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 3c7f7c9302..09d98e9c19 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -4,10 +4,10 @@ import ( "errors" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" commonFlag "go.podman.io/common/pkg/flag" ) diff --git a/pkg/domain/entities/secrets.go b/pkg/domain/entities/secrets.go index f865d546c6..47ac80121a 100644 --- a/pkg/domain/entities/secrets.go +++ b/pkg/domain/entities/secrets.go @@ -1,8 +1,8 @@ package entities import ( - "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/errorhandling" ) type SecretCreateReport = types.SecretCreateReport diff --git a/pkg/domain/entities/system.go b/pkg/domain/entities/system.go index ab9c861a02..3212dfdbe4 100644 --- a/pkg/domain/entities/system.go +++ b/pkg/domain/entities/system.go @@ -1,7 +1,7 @@ package entities import ( - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) // ServiceOptions provides the input for starting an API and sidecar pprof services diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index 455760f026..8e3d09419b 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -3,10 +3,10 @@ package entities import ( "net" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/specgen" "go.podman.io/common/libnetwork/types" "go.podman.io/storage/pkg/archive" ) diff --git a/pkg/domain/entities/types/container_ps.go b/pkg/domain/entities/types/container_ps.go index 8889298152..1d6fb60de6 100644 --- a/pkg/domain/entities/types/container_ps.go +++ b/pkg/domain/entities/types/container_ps.go @@ -3,7 +3,7 @@ package types import ( "time" - define "github.com/containers/podman/v5/pkg/ps/define" + define "github.com/containers/podman/v6/pkg/ps/define" netTypes "go.podman.io/common/libnetwork/types" ) diff --git a/pkg/domain/entities/types/containers.go b/pkg/domain/entities/types/containers.go index 2e8441dbe0..a954ba2546 100644 --- a/pkg/domain/entities/types/containers.go +++ b/pkg/domain/entities/types/containers.go @@ -1,8 +1,8 @@ package types import ( - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/specgen" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/domain/entities/types/images.go b/pkg/domain/entities/types/images.go index 744cd64631..5ed9c1d670 100644 --- a/pkg/domain/entities/types/images.go +++ b/pkg/domain/entities/types/images.go @@ -3,8 +3,8 @@ package types import ( "time" - "github.com/containers/podman/v5/pkg/inspect" - "github.com/containers/podman/v5/pkg/trust" + "github.com/containers/podman/v6/pkg/inspect" + "github.com/containers/podman/v6/pkg/trust" ) // swagger:model LibpodImageSummary diff --git a/pkg/domain/entities/types/pods.go b/pkg/domain/entities/types/pods.go index 8d150a89ed..38c083b196 100644 --- a/pkg/domain/entities/types/pods.go +++ b/pkg/domain/entities/types/pods.go @@ -3,8 +3,8 @@ package types import ( "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/specgen" ) type PodPruneReport struct { diff --git a/pkg/domain/entities/types/system.go b/pkg/domain/entities/types/system.go index b2243b46ba..538b0d6eb9 100644 --- a/pkg/domain/entities/types/system.go +++ b/pkg/domain/entities/types/system.go @@ -3,8 +3,8 @@ package types import ( "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities/reports" ) // ServiceOptions provides the input for starting an API and sidecar pprof services diff --git a/pkg/domain/entities/types/volumes.go b/pkg/domain/entities/types/volumes.go index 06e3727f10..12384a8815 100644 --- a/pkg/domain/entities/types/volumes.go +++ b/pkg/domain/entities/types/volumes.go @@ -1,7 +1,7 @@ package types import ( - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) // swagger:model diff --git a/pkg/domain/entities/volumes.go b/pkg/domain/entities/volumes.go index fe310f4fe3..83d127c14a 100644 --- a/pkg/domain/entities/volumes.go +++ b/pkg/domain/entities/volumes.go @@ -4,7 +4,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/domain/entities/types" ) // VolumeCreateOptions provides details for creating volumes diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go index 3cfd14f939..f3fd02b568 100644 --- a/pkg/domain/filters/containers.go +++ b/pkg/domain/filters/containers.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities/types" "go.podman.io/common/pkg/filters" "go.podman.io/common/pkg/util" "go.podman.io/storage" diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go index 7d17cd7f58..06691e1d9c 100644 --- a/pkg/domain/filters/pods.go +++ b/pkg/domain/filters/pods.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" "go.podman.io/common/pkg/filters" "go.podman.io/common/pkg/util" ) diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go index 276ef94924..e2cf8f2a9c 100644 --- a/pkg/domain/filters/volumes.go +++ b/pkg/domain/filters/volumes.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/util" "go.podman.io/common/pkg/filters" ) diff --git a/pkg/domain/infra/abi/apply.go b/pkg/domain/infra/abi/apply.go index 6c0caa2f6b..270539d055 100644 --- a/pkg/domain/infra/abi/apply.go +++ b/pkg/domain/infra/abi/apply.go @@ -14,8 +14,8 @@ import ( "os" "strings" - "github.com/containers/podman/v5/pkg/domain/entities" - k8sAPI "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/pkg/domain/entities" + k8sAPI "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" "sigs.k8s.io/yaml" ) diff --git a/pkg/domain/infra/abi/archive.go b/pkg/domain/infra/abi/archive.go index 711d54f93d..009f3bdb80 100644 --- a/pkg/domain/infra/abi/archive.go +++ b/pkg/domain/infra/abi/archive.go @@ -6,7 +6,7 @@ import ( "context" "io" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) ContainerCopyFromArchive(ctx context.Context, nameOrID, containerPath string, reader io.Reader, options entities.CopyOptions) (entities.ContainerCopyFunc, error) { diff --git a/pkg/domain/infra/abi/artifact.go b/pkg/domain/infra/abi/artifact.go index 0e1ccfefd2..9b5c4d3a51 100644 --- a/pkg/domain/infra/abi/artifact.go +++ b/pkg/domain/infra/abi/artifact.go @@ -10,7 +10,7 @@ import ( "os" "time" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/domain/infra/abi/auto-update.go b/pkg/domain/infra/abi/auto-update.go index f8f14169da..d14ef7748d 100644 --- a/pkg/domain/infra/abi/auto-update.go +++ b/pkg/domain/infra/abi/auto-update.go @@ -5,8 +5,8 @@ package abi import ( "context" - "github.com/containers/podman/v5/pkg/autoupdate" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/autoupdate" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) AutoUpdate(ctx context.Context, options entities.AutoUpdateOptions) ([]*entities.AutoUpdateReport, []error) { diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 7e7a9ef923..90c40ccfc6 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -15,23 +15,23 @@ import ( "time" "github.com/containers/buildah" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/logs" - "github.com/containers/podman/v5/pkg/checkpoint" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - dfilters "github.com/containers/podman/v5/pkg/domain/filters" - "github.com/containers/podman/v5/pkg/domain/infra/abi/terminal" - "github.com/containers/podman/v5/pkg/errorhandling" - parallelctr "github.com/containers/podman/v5/pkg/parallel/ctr" - "github.com/containers/podman/v5/pkg/ps" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/signal" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgen/generate" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/logs" + "github.com/containers/podman/v6/pkg/checkpoint" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + dfilters "github.com/containers/podman/v6/pkg/domain/filters" + "github.com/containers/podman/v6/pkg/domain/infra/abi/terminal" + "github.com/containers/podman/v6/pkg/errorhandling" + parallelctr "github.com/containers/podman/v6/pkg/parallel/ctr" + "github.com/containers/podman/v6/pkg/ps" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/signal" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgen/generate" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/util" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go index baa957d0fa..72c8cf2e29 100644 --- a/pkg/domain/infra/abi/containers_runlabel.go +++ b/pkg/domain/infra/abi/containers_runlabel.go @@ -11,10 +11,10 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - envLib "github.com/containers/podman/v5/pkg/env" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + envLib "github.com/containers/podman/v6/pkg/env" + "github.com/containers/podman/v6/utils" "github.com/google/shlex" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/domain/infra/abi/containers_stat.go b/pkg/domain/infra/abi/containers_stat.go index aed498fe01..9b9d406fea 100644 --- a/pkg/domain/infra/abi/containers_stat.go +++ b/pkg/domain/infra/abi/containers_stat.go @@ -5,7 +5,7 @@ package abi import ( "context" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) ContainerStat(ctx context.Context, nameOrID string, containerPath string) (*entities.ContainerStatReport, error) { diff --git a/pkg/domain/infra/abi/events.go b/pkg/domain/infra/abi/events.go index ad2bf5313f..96f13c8222 100644 --- a/pkg/domain/infra/abi/events.go +++ b/pkg/domain/infra/abi/events.go @@ -5,8 +5,8 @@ package abi import ( "context" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) Events(ctx context.Context, opts entities.EventsOptions) error { diff --git a/pkg/domain/infra/abi/farm.go b/pkg/domain/infra/abi/farm.go index d78ba7b2f6..6096decd58 100644 --- a/pkg/domain/infra/abi/farm.go +++ b/pkg/domain/infra/abi/farm.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/containers/buildah/pkg/parse" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/emulation" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/emulation" lplatform "go.podman.io/common/libimage/platform" ) diff --git a/pkg/domain/infra/abi/generate.go b/pkg/domain/infra/abi/generate.go index ee29d88c3b..8bbef87532 100644 --- a/pkg/domain/infra/abi/generate.go +++ b/pkg/domain/infra/abi/generate.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - k8sAPI "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v5/pkg/specgen" - generateUtils "github.com/containers/podman/v5/pkg/specgen/generate" - "github.com/containers/podman/v5/pkg/systemd/generate" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + k8sAPI "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/pkg/specgen" + generateUtils "github.com/containers/podman/v6/pkg/specgen/generate" + "github.com/containers/podman/v6/pkg/systemd/generate" "sigs.k8s.io/yaml" ) diff --git a/pkg/domain/infra/abi/healthcheck.go b/pkg/domain/infra/abi/healthcheck.go index 767cb2454c..f978b599be 100644 --- a/pkg/domain/infra/abi/healthcheck.go +++ b/pkg/domain/infra/abi/healthcheck.go @@ -5,8 +5,8 @@ package abi import ( "context" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) HealthCheckRun(ctx context.Context, nameOrID string, _ entities.HealthCheckOptions) (*define.HealthCheckResults, error) { diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 2d77b12802..44429dd3fe 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -21,12 +21,12 @@ import ( bdefine "github.com/containers/buildah/define" "github.com/containers/buildah/pkg/volumes" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - domainUtils "github.com/containers/podman/v5/pkg/domain/utils" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + domainUtils "github.com/containers/podman/v6/pkg/domain/utils" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/rootless" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go index d8a40d4d7d..28bb2cbc8b 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -7,8 +7,8 @@ import ( "fmt" "slices" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/common/libimage" ) diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index c90db84ddd..0843ee47c2 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -12,8 +12,8 @@ import ( "slices" "strings" - "github.com/containers/podman/v5/pkg/domain/entities" - envLib "github.com/containers/podman/v5/pkg/env" + "github.com/containers/podman/v6/pkg/domain/entities" + envLib "github.com/containers/podman/v6/pkg/env" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go index 2aa45d9943..ec07c41c20 100644 --- a/pkg/domain/infra/abi/network.go +++ b/pkg/domain/infra/abi/network.go @@ -9,9 +9,9 @@ import ( "slices" "strconv" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/common/libnetwork/pasta" "go.podman.io/common/libnetwork/slirp4netns" "go.podman.io/common/libnetwork/types" diff --git a/pkg/domain/infra/abi/parse/parse.go b/pkg/domain/infra/abi/parse/parse.go index 41771bb887..12b6594dd7 100644 --- a/pkg/domain/infra/abi/parse/parse.go +++ b/pkg/domain/infra/abi/parse/parse.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" "github.com/docker/go-units" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index bf41e73a44..ae4b425d4f 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -17,22 +17,22 @@ import ( buildahDefine "github.com/containers/buildah/define" bparse "github.com/containers/buildah/pkg/parse" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/annotations" - "github.com/containers/podman/v5/pkg/domain/entities" - entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/podman/v5/pkg/domain/infra/abi/internal/expansion" - v1apps "github.com/containers/podman/v5/pkg/k8s.io/api/apps/v1" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - metav1 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgen/generate" - "github.com/containers/podman/v5/pkg/specgen/generate/kube" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/systemd/notifyproxy" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/annotations" + "github.com/containers/podman/v6/pkg/domain/entities" + entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" + "github.com/containers/podman/v6/pkg/domain/infra/abi/internal/expansion" + v1apps "github.com/containers/podman/v6/pkg/k8s.io/api/apps/v1" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + metav1 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgen/generate" + "github.com/containers/podman/v6/pkg/specgen/generate/kube" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/systemd/notifyproxy" + "github.com/containers/podman/v6/pkg/util" "github.com/coreos/go-systemd/v22/daemon" "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux" diff --git a/pkg/domain/infra/abi/play_test.go b/pkg/domain/infra/abi/play_test.go index 664d68a02c..9d6a72ad06 100644 --- a/pkg/domain/infra/abi/play_test.go +++ b/pkg/domain/infra/abi/play_test.go @@ -6,8 +6,8 @@ import ( "bytes" "testing" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - v12 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + v12 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/stretchr/testify/assert" ) diff --git a/pkg/domain/infra/abi/play_utils.go b/pkg/domain/infra/abi/play_utils.go index 217b656997..32ae0213b8 100644 --- a/pkg/domain/infra/abi/play_utils.go +++ b/pkg/domain/infra/abi/play_utils.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/pkg/domain/infra/abi/play_utils_test.go b/pkg/domain/infra/abi/play_utils_test.go index fa4b6010c0..5054947ca0 100644 --- a/pkg/domain/infra/abi/play_utils_test.go +++ b/pkg/domain/infra/abi/play_utils_test.go @@ -5,7 +5,7 @@ package abi import ( "testing" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/stretchr/testify/require" ) diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index de41c08a74..5af15cd888 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -9,13 +9,13 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - dfilters "github.com/containers/podman/v5/pkg/domain/filters" - "github.com/containers/podman/v5/pkg/signal" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgen/generate" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + dfilters "github.com/containers/podman/v6/pkg/domain/filters" + "github.com/containers/podman/v6/pkg/signal" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgen/generate" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/pods_stats.go b/pkg/domain/infra/abi/pods_stats.go index 88e8cf6d44..4f381ac742 100644 --- a/pkg/domain/infra/abi/pods_stats.go +++ b/pkg/domain/infra/abi/pods_stats.go @@ -8,10 +8,10 @@ import ( "fmt" "strconv" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/rootless" "github.com/docker/go-units" "go.podman.io/common/pkg/cgroups" ) diff --git a/pkg/domain/infra/abi/quadlet.go b/pkg/domain/infra/abi/quadlet.go index 76bf02f1c7..9011d79f21 100644 --- a/pkg/domain/infra/abi/quadlet.go +++ b/pkg/domain/infra/abi/quadlet.go @@ -17,12 +17,12 @@ import ( "slices" "strings" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/systemd" - "github.com/containers/podman/v5/pkg/systemd/parser" - systemdquadlet "github.com/containers/podman/v5/pkg/systemd/quadlet" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/systemd" + "github.com/containers/podman/v6/pkg/systemd/parser" + systemdquadlet "github.com/containers/podman/v6/pkg/systemd/quadlet" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/domain/infra/abi/runtime.go b/pkg/domain/infra/abi/runtime.go index 6e5f3240ef..9ceb6c3d58 100644 --- a/pkg/domain/infra/abi/runtime.go +++ b/pkg/domain/infra/abi/runtime.go @@ -5,7 +5,7 @@ package abi import ( "sync" - "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v6/libpod" ) // Image-related runtime linked against libpod library diff --git a/pkg/domain/infra/abi/secrets.go b/pkg/domain/infra/abi/secrets.go index 2bb2ae2b9c..43755a5e5f 100644 --- a/pkg/domain/infra/abi/secrets.go +++ b/pkg/domain/infra/abi/secrets.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/utils" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/utils" "go.podman.io/common/pkg/secrets" ) diff --git a/pkg/domain/infra/abi/secrets_test.go b/pkg/domain/infra/abi/secrets_test.go index d11d8726d2..ee67fae00a 100644 --- a/pkg/domain/infra/abi/secrets_test.go +++ b/pkg/domain/infra/abi/secrets_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" "go.podman.io/common/pkg/secrets" ) diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index dab37a6903..955e015127 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -12,11 +12,11 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/emulation" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/emulation" + "github.com/containers/podman/v6/pkg/util" "go.podman.io/storage" "go.podman.io/storage/pkg/directory" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/domain/infra/abi/system_linux.go b/pkg/domain/infra/abi/system_linux.go index 7acaa9bd19..5348a0d972 100644 --- a/pkg/domain/infra/abi/system_linux.go +++ b/pkg/domain/infra/abi/system_linux.go @@ -7,8 +7,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/config" diff --git a/pkg/domain/infra/abi/terminal/sigproxy_commn.go b/pkg/domain/infra/abi/terminal/sigproxy_commn.go index 629b2e9c33..cdb6356255 100644 --- a/pkg/domain/infra/abi/terminal/sigproxy_commn.go +++ b/pkg/domain/infra/abi/terminal/sigproxy_commn.go @@ -7,10 +7,10 @@ import ( "os" "syscall" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/libpod/shutdown" - "github.com/containers/podman/v5/pkg/signal" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/libpod/shutdown" + "github.com/containers/podman/v6/pkg/signal" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/terminal/terminal.go b/pkg/domain/infra/abi/terminal/terminal.go index 9c654c2605..a39a2a71ad 100644 --- a/pkg/domain/infra/abi/terminal/terminal.go +++ b/pkg/domain/infra/abi/terminal/terminal.go @@ -8,7 +8,7 @@ import ( "os" "os/signal" - lsignal "github.com/containers/podman/v5/pkg/signal" + lsignal "github.com/containers/podman/v6/pkg/signal" "github.com/moby/term" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" diff --git a/pkg/domain/infra/abi/terminal/terminal_common.go b/pkg/domain/infra/abi/terminal/terminal_common.go index 169fcde36c..f7f802498c 100644 --- a/pkg/domain/infra/abi/terminal/terminal_common.go +++ b/pkg/domain/infra/abi/terminal/terminal_common.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" "golang.org/x/term" diff --git a/pkg/domain/infra/abi/terminal/terminal_unsupported.go b/pkg/domain/infra/abi/terminal/terminal_unsupported.go index b67c738751..08a3bcf4d9 100644 --- a/pkg/domain/infra/abi/terminal/terminal_unsupported.go +++ b/pkg/domain/infra/abi/terminal/terminal_unsupported.go @@ -7,8 +7,8 @@ import ( "errors" "os" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" ) // ExecAttachCtr execs and attaches to a container diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go index fe88caa327..c40d9e49f0 100644 --- a/pkg/domain/infra/abi/trust.go +++ b/pkg/domain/infra/abi/trust.go @@ -7,8 +7,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/trust" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/trust" ) func (ir *ImageEngine) ShowTrust(_ context.Context, _ []string, options entities.ShowTrustOptions) (*entities.ShowTrustReport, error) { diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go index 49fe2b9604..07342c98a5 100644 --- a/pkg/domain/infra/abi/volumes.go +++ b/pkg/domain/infra/abi/volumes.go @@ -8,12 +8,12 @@ import ( "fmt" "io" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/filters" - "github.com/containers/podman/v5/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/filters" + "github.com/containers/podman/v6/pkg/domain/infra/abi/parse" ) func (ic *ContainerEngine) VolumeCreate(ctx context.Context, opts entities.VolumeCreateOptions) (*entities.IDOrNameResponse, error) { diff --git a/pkg/domain/infra/runtime_abi.go b/pkg/domain/infra/runtime_abi.go index 5f55db0de8..d6f8fa845d 100644 --- a/pkg/domain/infra/runtime_abi.go +++ b/pkg/domain/infra/runtime_abi.go @@ -6,9 +6,9 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/tunnel" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/tunnel" ) // NewContainerEngine factory provides a libpod runtime for container-related operations diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index 34cea76b2f..57a801aeab 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -13,11 +13,11 @@ import ( "sync" "syscall" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" flag "github.com/spf13/pflag" "go.podman.io/common/pkg/cgroups" diff --git a/pkg/domain/infra/runtime_proxy.go b/pkg/domain/infra/runtime_proxy.go index f8c2daacac..03d837512e 100644 --- a/pkg/domain/infra/runtime_proxy.go +++ b/pkg/domain/infra/runtime_proxy.go @@ -5,8 +5,8 @@ package infra import ( "context" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/abi" flag "github.com/spf13/pflag" ) diff --git a/pkg/domain/infra/runtime_tunnel.go b/pkg/domain/infra/runtime_tunnel.go index d1647b89c3..8092f683a4 100644 --- a/pkg/domain/infra/runtime_tunnel.go +++ b/pkg/domain/infra/runtime_tunnel.go @@ -7,9 +7,9 @@ import ( "fmt" "sync" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra/tunnel" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra/tunnel" ) var ( diff --git a/pkg/domain/infra/tunnel/artifact.go b/pkg/domain/infra/tunnel/artifact.go index 19cbd2126c..59c49fff79 100644 --- a/pkg/domain/infra/tunnel/artifact.go +++ b/pkg/domain/infra/tunnel/artifact.go @@ -7,8 +7,8 @@ import ( "io" "os" - "github.com/containers/podman/v5/pkg/bindings/artifacts" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/bindings/artifacts" + "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/image/v5/types" ) diff --git a/pkg/domain/infra/tunnel/auto-update.go b/pkg/domain/infra/tunnel/auto-update.go index 322c04c226..31d46a6a90 100644 --- a/pkg/domain/infra/tunnel/auto-update.go +++ b/pkg/domain/infra/tunnel/auto-update.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) AutoUpdate(_ context.Context, _ entities.AutoUpdateOptions) ([]*entities.AutoUpdateReport, []error) { diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index a834f453a5..1eb275457e 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -12,16 +12,16 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/api/handlers" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/api/handlers" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker/reference" diff --git a/pkg/domain/infra/tunnel/events.go b/pkg/domain/infra/tunnel/events.go index cc722866a7..0e7d87a7bc 100644 --- a/pkg/domain/infra/tunnel/events.go +++ b/pkg/domain/infra/tunnel/events.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/libpod/events" - "github.com/containers/podman/v5/pkg/bindings/system" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/events" + "github.com/containers/podman/v6/pkg/bindings/system" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) Events(_ context.Context, opts entities.EventsOptions) error { diff --git a/pkg/domain/infra/tunnel/farm.go b/pkg/domain/infra/tunnel/farm.go index 9fd278513f..b4e9105c46 100644 --- a/pkg/domain/infra/tunnel/farm.go +++ b/pkg/domain/infra/tunnel/farm.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/podman/v5/pkg/bindings/system" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/bindings/system" + "github.com/containers/podman/v6/pkg/domain/entities" ) const ( diff --git a/pkg/domain/infra/tunnel/healthcheck.go b/pkg/domain/infra/tunnel/healthcheck.go index 49501c252d..4d2bece929 100644 --- a/pkg/domain/infra/tunnel/healthcheck.go +++ b/pkg/domain/infra/tunnel/healthcheck.go @@ -3,9 +3,9 @@ package tunnel import ( "context" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) HealthCheckRun(_ context.Context, nameOrID string, _ entities.HealthCheckOptions) (*define.HealthCheckResults, error) { diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go index 12ebe94f75..447218900f 100644 --- a/pkg/domain/infra/tunnel/helpers.go +++ b/pkg/domain/infra/tunnel/helpers.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings/containers" - "github.com/containers/podman/v5/pkg/bindings/pods" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings/containers" + "github.com/containers/podman/v6/pkg/bindings/pods" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" ) // FIXME: the `ignore` parameter is very likely wrong here as it should rather diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index 0a86dba08d..2d841232c6 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -11,13 +11,13 @@ import ( "time" bdefine "github.com/containers/buildah/define" - "github.com/containers/podman/v5/internal/localapi" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/domain/utils" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/internal/localapi" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/domain/utils" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" "go.podman.io/common/libimage/filter" "go.podman.io/common/pkg/config" diff --git a/pkg/domain/infra/tunnel/kube.go b/pkg/domain/infra/tunnel/kube.go index e9198590dc..216c7c530e 100644 --- a/pkg/domain/infra/tunnel/kube.go +++ b/pkg/domain/infra/tunnel/kube.go @@ -5,10 +5,10 @@ import ( "fmt" "io" - "github.com/containers/podman/v5/pkg/bindings/generate" - "github.com/containers/podman/v5/pkg/bindings/kube" - "github.com/containers/podman/v5/pkg/bindings/play" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/bindings/generate" + "github.com/containers/podman/v6/pkg/bindings/kube" + "github.com/containers/podman/v6/pkg/bindings/play" + "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/image/v5/types" ) diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go index fe4c83b2d6..eb5caf1b32 100644 --- a/pkg/domain/infra/tunnel/manifest.go +++ b/pkg/domain/infra/tunnel/manifest.go @@ -6,10 +6,10 @@ import ( "slices" "strings" - "github.com/containers/podman/v5/pkg/bindings/images" - "github.com/containers/podman/v5/pkg/bindings/manifests" - "github.com/containers/podman/v5/pkg/domain/entities" - envLib "github.com/containers/podman/v5/pkg/env" + "github.com/containers/podman/v6/pkg/bindings/images" + "github.com/containers/podman/v6/pkg/bindings/manifests" + "github.com/containers/podman/v6/pkg/domain/entities" + envLib "github.com/containers/podman/v6/pkg/env" "go.podman.io/common/libimage/define" "go.podman.io/image/v5/types" ) diff --git a/pkg/domain/infra/tunnel/network.go b/pkg/domain/infra/tunnel/network.go index 51c0271f75..f6bb4b8a74 100644 --- a/pkg/domain/infra/tunnel/network.go +++ b/pkg/domain/infra/tunnel/network.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings/network" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings/network" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" "go.podman.io/common/libnetwork/types" ) diff --git a/pkg/domain/infra/tunnel/pods.go b/pkg/domain/infra/tunnel/pods.go index 7c567cf31b..6538d5d725 100644 --- a/pkg/domain/infra/tunnel/pods.go +++ b/pkg/domain/infra/tunnel/pods.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings/pods" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings/pods" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/util" ) func (ic *ContainerEngine) PodExists(_ context.Context, nameOrID string) (*entities.BoolReport, error) { diff --git a/pkg/domain/infra/tunnel/quadlet.go b/pkg/domain/infra/tunnel/quadlet.go index e48d31f79e..752d0178fc 100644 --- a/pkg/domain/infra/tunnel/quadlet.go +++ b/pkg/domain/infra/tunnel/quadlet.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" ) var errNotImplemented = errors.New("not implemented for the remote Podman client") diff --git a/pkg/domain/infra/tunnel/runtime.go b/pkg/domain/infra/tunnel/runtime.go index 2a8aa8b258..c8a1632899 100644 --- a/pkg/domain/infra/tunnel/runtime.go +++ b/pkg/domain/infra/tunnel/runtime.go @@ -6,8 +6,8 @@ import ( "sync" "syscall" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/signal" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/signal" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/tunnel/secrets.go b/pkg/domain/infra/tunnel/secrets.go index 0e8edbfe5d..8d2a857d32 100644 --- a/pkg/domain/infra/tunnel/secrets.go +++ b/pkg/domain/infra/tunnel/secrets.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/containers/podman/v5/pkg/bindings/secrets" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/bindings/secrets" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/errorhandling" ) func (ic *ContainerEngine) SecretCreate(_ context.Context, name string, reader io.Reader, options entities.SecretCreateOptions) (*entities.SecretCreateReport, error) { diff --git a/pkg/domain/infra/tunnel/system.go b/pkg/domain/infra/tunnel/system.go index c863130866..e7aefe90dc 100644 --- a/pkg/domain/infra/tunnel/system.go +++ b/pkg/domain/infra/tunnel/system.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings/system" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings/system" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) Info(_ context.Context) (*define.Info, error) { diff --git a/pkg/domain/infra/tunnel/trust.go b/pkg/domain/infra/tunnel/trust.go index 0c1ea2ff8a..8d0a670363 100644 --- a/pkg/domain/infra/tunnel/trust.go +++ b/pkg/domain/infra/tunnel/trust.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" ) func (ir *ImageEngine) ShowTrust(_ context.Context, _ []string, _ entities.ShowTrustOptions) (*entities.ShowTrustReport, error) { diff --git a/pkg/domain/infra/tunnel/volumes.go b/pkg/domain/infra/tunnel/volumes.go index bd3b0d2569..d78a42143f 100644 --- a/pkg/domain/infra/tunnel/volumes.go +++ b/pkg/domain/infra/tunnel/volumes.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/pkg/bindings/volumes" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/entities/reports" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/bindings/volumes" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities/reports" + "github.com/containers/podman/v6/pkg/errorhandling" ) func (ic *ContainerEngine) VolumeCreate(_ context.Context, opts entities.VolumeCreateOptions) (*entities.IDOrNameResponse, error) { diff --git a/pkg/domain/utils/scp.go b/pkg/domain/utils/scp.go index 03a5f62988..6c2a8406d5 100644 --- a/pkg/domain/utils/scp.go +++ b/pkg/domain/utils/scp.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/ssh" diff --git a/pkg/domain/utils/scp_test.go b/pkg/domain/utils/scp_test.go index f6dbfb927e..269f04c16f 100644 --- a/pkg/domain/utils/scp_test.go +++ b/pkg/domain/utils/scp_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/pkg/domain/utils/secrets_filters.go b/pkg/domain/utils/secrets_filters.go index a7529e8d05..5adf184aea 100644 --- a/pkg/domain/utils/secrets_filters.go +++ b/pkg/domain/utils/secrets_filters.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/util" "go.podman.io/common/pkg/secrets" ) diff --git a/pkg/domain/utils/utils_test.go b/pkg/domain/utils/utils_test.go index 4ecdf32164..cd1e553b00 100644 --- a/pkg/domain/utils/utils_test.go +++ b/pkg/domain/utils/utils_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/pkg/farm/farm.go b/pkg/farm/farm.go index 7dfb495a8b..cb936a856d 100644 --- a/pkg/farm/farm.go +++ b/pkg/farm/farm.go @@ -12,8 +12,8 @@ import ( "sync" "github.com/containers/buildah/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/infra" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/infra" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" lplatform "go.podman.io/common/libimage/platform" diff --git a/pkg/farm/list_builder.go b/pkg/farm/list_builder.go index 42f032d044..03423138a1 100644 --- a/pkg/farm/list_builder.go +++ b/pkg/farm/list_builder.go @@ -6,7 +6,7 @@ import ( "os" "sync" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" "go.podman.io/image/v5/docker" diff --git a/pkg/fileserver/server_windows.go b/pkg/fileserver/server_windows.go index 029438d9c1..c4532a20a6 100644 --- a/pkg/fileserver/server_windows.go +++ b/pkg/fileserver/server_windows.go @@ -3,7 +3,7 @@ package fileserver import ( "fmt" - "github.com/containers/podman/v5/pkg/fileserver/plan9" + "github.com/containers/podman/v6/pkg/fileserver/plan9" "github.com/linuxkit/virtsock/pkg/hvsock" "github.com/sirupsen/logrus" ) diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go index f516931fe9..167d91f12c 100644 --- a/pkg/inspect/inspect.go +++ b/pkg/inspect/inspect.go @@ -3,7 +3,7 @@ package inspect import ( "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "go.podman.io/image/v5/manifest" diff --git a/pkg/k8s.io/api/apps/v1/types.go b/pkg/k8s.io/api/apps/v1/types.go index 0883855ae0..7e90ad1883 100644 --- a/pkg/k8s.io/api/apps/v1/types.go +++ b/pkg/k8s.io/api/apps/v1/types.go @@ -17,9 +17,9 @@ limitations under the License. package v1 import ( - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - metav1 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + metav1 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" ) const ( diff --git a/pkg/k8s.io/api/core/v1/resource.go b/pkg/k8s.io/api/core/v1/resource.go index fb4e8556dc..5a89084fbe 100644 --- a/pkg/k8s.io/api/core/v1/resource.go +++ b/pkg/k8s.io/api/core/v1/resource.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" ) // Returns string version of ResourceName. diff --git a/pkg/k8s.io/api/core/v1/types.go b/pkg/k8s.io/api/core/v1/types.go index 60074575fd..ea8d3d99dd 100644 --- a/pkg/k8s.io/api/core/v1/types.go +++ b/pkg/k8s.io/api/core/v1/types.go @@ -17,10 +17,10 @@ limitations under the License. package v1 import ( - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" - metav1 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/types" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" + metav1 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/types" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" ) // Volume represents a named volume in a pod that may be accessed by any container in the pod. diff --git a/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go index 921a36d164..3c953b499b 100644 --- a/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go +++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go @@ -30,7 +30,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/types" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/types" ) // TypeMeta describes an individual object in an API response or request diff --git a/pkg/machine/apple/apple.go b/pkg/machine/apple/apple.go index c434126ecc..53d22e472e 100644 --- a/pkg/machine/apple/apple.go +++ b/pkg/machine/apple/apple.go @@ -13,12 +13,12 @@ import ( "time" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/podman/v5/pkg/machine/sockets" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/pkg/systemd/parser" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/sockets" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/systemd/parser" vfConfig "github.com/crc-org/vfkit/pkg/config" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" diff --git a/pkg/machine/apple/ignition.go b/pkg/machine/apple/ignition.go index df9cbe1b1c..6d6910193f 100644 --- a/pkg/machine/apple/ignition.go +++ b/pkg/machine/apple/ignition.go @@ -6,8 +6,8 @@ import ( "net" "net/http" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/apple/vfkit.go b/pkg/machine/apple/vfkit.go index 1864e3dccf..f758f115ad 100644 --- a/pkg/machine/apple/vfkit.go +++ b/pkg/machine/apple/vfkit.go @@ -5,8 +5,8 @@ package apple import ( "errors" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" vfConfig "github.com/crc-org/vfkit/pkg/config" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/apple/vfkit/helper.go b/pkg/machine/apple/vfkit/helper.go index cc3a22efb4..11d54a8c8e 100644 --- a/pkg/machine/apple/vfkit/helper.go +++ b/pkg/machine/apple/vfkit/helper.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "github.com/crc-org/vfkit/pkg/config" rest "github.com/crc-org/vfkit/pkg/rest/define" "github.com/sirupsen/logrus" diff --git a/pkg/machine/apple/vfkit/rest.go b/pkg/machine/apple/vfkit/rest.go index aa11cd159e..60f717a652 100644 --- a/pkg/machine/apple/vfkit/rest.go +++ b/pkg/machine/apple/vfkit/rest.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) type Endpoint string diff --git a/pkg/machine/applehv/machine.go b/pkg/machine/applehv/machine.go index ca802d6a28..bb5fbb1e49 100644 --- a/pkg/machine/applehv/machine.go +++ b/pkg/machine/applehv/machine.go @@ -3,8 +3,8 @@ package applehv import ( - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" ) func (a *AppleHVStubber) Remove(_ *vmconfigs.MachineConfig) ([]string, func() error, error) { diff --git a/pkg/machine/applehv/stubber.go b/pkg/machine/applehv/stubber.go index e232bb7ee6..19b24b5c2b 100644 --- a/pkg/machine/applehv/stubber.go +++ b/pkg/machine/applehv/stubber.go @@ -8,13 +8,13 @@ import ( "strconv" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/apple" - "github.com/containers/podman/v5/pkg/machine/apple/vfkit" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/apple" + "github.com/containers/podman/v6/pkg/machine/apple/vfkit" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/utils" vfConfig "github.com/crc-org/vfkit/pkg/config" "go.podman.io/common/pkg/config" ) diff --git a/pkg/machine/compression/compression_test.go b/pkg/machine/compression/compression_test.go index 9c51cd8bca..b0b6b8d29f 100644 --- a/pkg/machine/compression/compression_test.go +++ b/pkg/machine/compression/compression_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/machine/compression/decompress.go b/pkg/machine/compression/decompress.go index 817afa8253..2f7b17c79c 100644 --- a/pkg/machine/compression/decompress.go +++ b/pkg/machine/compression/decompress.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/archive" ) diff --git a/pkg/machine/config.go b/pkg/machine/config.go index be35b348e3..87998bebed 100644 --- a/pkg/machine/config.go +++ b/pkg/machine/config.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/machine/compression" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/compression" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/strongunits" ) diff --git a/pkg/machine/config_test.go b/pkg/machine/config_test.go index a0b5afcb95..02031bb4da 100644 --- a/pkg/machine/config_test.go +++ b/pkg/machine/config_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/containers/podman/v5/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/env" "github.com/stretchr/testify/assert" ) diff --git a/pkg/machine/connection/add.go b/pkg/machine/connection/add.go index 930c63f6ce..41c8cc0681 100644 --- a/pkg/machine/connection/add.go +++ b/pkg/machine/connection/add.go @@ -6,7 +6,7 @@ import ( "fmt" "strconv" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) // AddSSHConnectionsToPodmanSocket adds SSH connections to the podman socket if diff --git a/pkg/machine/connection/connection.go b/pkg/machine/connection/connection.go index e93dcc6f75..f10b266ba7 100644 --- a/pkg/machine/connection/connection.go +++ b/pkg/machine/connection/connection.go @@ -8,7 +8,7 @@ import ( "net" "net/url" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "go.podman.io/common/pkg/config" ) diff --git a/pkg/machine/define/vmfile_test.go b/pkg/machine/define/vmfile_test.go index c7be92d66d..00e01d63e0 100644 --- a/pkg/machine/define/vmfile_test.go +++ b/pkg/machine/define/vmfile_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/test/utils" ) func TestMachineFile_GetPath(t *testing.T) { diff --git a/pkg/machine/e2e/api_test.go b/pkg/machine/e2e/api_test.go index 6e081d7975..f5dda2f39c 100644 --- a/pkg/machine/e2e/api_test.go +++ b/pkg/machine/e2e/api_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "runtime" - "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v6/pkg/machine" "github.com/docker/docker/client" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" diff --git a/pkg/machine/e2e/basic_test.go b/pkg/machine/e2e/basic_test.go index 59f6e116be..27a2df09eb 100644 --- a/pkg/machine/e2e/basic_test.go +++ b/pkg/machine/e2e/basic_test.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/compose_test.go b/pkg/machine/e2e/compose_test.go index 3c1f8d7982..88154ce099 100644 --- a/pkg/machine/e2e/compose_test.go +++ b/pkg/machine/e2e/compose_test.go @@ -5,7 +5,7 @@ import ( "runtime" "strings" - "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v6/pkg/machine" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" diff --git a/pkg/machine/e2e/config_darwin_test.go b/pkg/machine/e2e/config_darwin_test.go index d7860a8814..6759e6a472 100644 --- a/pkg/machine/e2e/config_darwin_test.go +++ b/pkg/machine/e2e/config_darwin_test.go @@ -1,6 +1,6 @@ package e2e_test -import "github.com/containers/podman/v5/pkg/machine/define" +import "github.com/containers/podman/v6/pkg/machine/define" const podmanBinary = "../../../bin/darwin/podman" diff --git a/pkg/machine/e2e/config_test.go b/pkg/machine/e2e/config_test.go index cf9edb8845..de3f38a512 100644 --- a/pkg/machine/e2e/config_test.go +++ b/pkg/machine/e2e/config_test.go @@ -13,8 +13,8 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" diff --git a/pkg/machine/e2e/config_windows_test.go b/pkg/machine/e2e/config_windows_test.go index 0e80883a70..c208a0f8ec 100644 --- a/pkg/machine/e2e/config_windows_test.go +++ b/pkg/machine/e2e/config_windows_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega/gexec" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) const podmanBinary = "../../../bin/windows/podman.exe" diff --git a/pkg/machine/e2e/info_test.go b/pkg/machine/e2e/info_test.go index 7f3af2516e..289b5c5d86 100644 --- a/pkg/machine/e2e/info_test.go +++ b/pkg/machine/e2e/info_test.go @@ -3,7 +3,7 @@ package e2e_test import ( "strconv" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/machine/e2e/init_test.go b/pkg/machine/e2e/init_test.go index 2ff80072b0..bc5afe8b94 100644 --- a/pkg/machine/e2e/init_test.go +++ b/pkg/machine/e2e/init_test.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/init_windows_test.go b/pkg/machine/e2e/init_windows_test.go index 67c3a82898..88f78679f6 100644 --- a/pkg/machine/e2e/init_windows_test.go +++ b/pkg/machine/e2e/init_windows_test.go @@ -8,7 +8,7 @@ import ( "github.com/Microsoft/go-winio/vhd" "github.com/containers/libhvee/pkg/hypervctl" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/inspect_test.go b/pkg/machine/e2e/inspect_test.go index 7bc396a55d..dc52663ed7 100644 --- a/pkg/machine/e2e/inspect_test.go +++ b/pkg/machine/e2e/inspect_test.go @@ -3,7 +3,7 @@ package e2e_test import ( "runtime" - "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v6/pkg/machine" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" diff --git a/pkg/machine/e2e/list_test.go b/pkg/machine/e2e/list_test.go index 226dadf400..6551c6157e 100644 --- a/pkg/machine/e2e/list_test.go +++ b/pkg/machine/e2e/list_test.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/machine/define" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/machine/e2e/machine_pull_test.go b/pkg/machine/e2e/machine_pull_test.go index 9374b3b18b..bf05219aed 100644 --- a/pkg/machine/e2e/machine_pull_test.go +++ b/pkg/machine/e2e/machine_pull_test.go @@ -7,9 +7,9 @@ import ( "runtime" "strings" - "github.com/containers/podman/v5/pkg/machine/compression" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/ocipull" + "github.com/containers/podman/v6/pkg/machine/compression" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/ocipull" "go.podman.io/image/v5/types" ) diff --git a/pkg/machine/e2e/machine_test.go b/pkg/machine/e2e/machine_test.go index 9504a834b3..397bb7f3c1 100644 --- a/pkg/machine/e2e/machine_test.go +++ b/pkg/machine/e2e/machine_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/provider" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/provider" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/common/pkg/config" diff --git a/pkg/machine/e2e/proxy_test.go b/pkg/machine/e2e/proxy_test.go index 951d8b0059..92820529e5 100644 --- a/pkg/machine/e2e/proxy_test.go +++ b/pkg/machine/e2e/proxy_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/rm_test.go b/pkg/machine/e2e/rm_test.go index 119c5b4b7a..b149a6a9bb 100644 --- a/pkg/machine/e2e/rm_test.go +++ b/pkg/machine/e2e/rm_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/set_test.go b/pkg/machine/e2e/set_test.go index 0becff0083..387d2bb8f6 100644 --- a/pkg/machine/e2e/set_test.go +++ b/pkg/machine/e2e/set_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/ssh_test.go b/pkg/machine/e2e/ssh_test.go index 8d90481f4d..86585649e1 100644 --- a/pkg/machine/e2e/ssh_test.go +++ b/pkg/machine/e2e/ssh_test.go @@ -1,7 +1,7 @@ package e2e_test import ( - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/start_test.go b/pkg/machine/e2e/start_test.go index 73a25b5eb4..e04e4a46a8 100644 --- a/pkg/machine/e2e/start_test.go +++ b/pkg/machine/e2e/start_test.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/env/dir.go b/pkg/machine/env/dir.go index 3de9238ff2..f9364d1afe 100644 --- a/pkg/machine/env/dir.go +++ b/pkg/machine/env/dir.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/homedir" ) diff --git a/pkg/machine/env/dir_linux.go b/pkg/machine/env/dir_linux.go index 67f8142440..66248a244d 100644 --- a/pkg/machine/env/dir_linux.go +++ b/pkg/machine/env/dir_linux.go @@ -1,8 +1,8 @@ package env import ( - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" ) func getRuntimeDir() (string, error) { diff --git a/pkg/machine/gvproxy.go b/pkg/machine/gvproxy.go index 2c083cb20b..97eef42ac0 100644 --- a/pkg/machine/gvproxy.go +++ b/pkg/machine/gvproxy.go @@ -6,7 +6,7 @@ import ( "io/fs" "strconv" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) // CleanupGVProxy reads the --pid-file for gvproxy attempts to stop it diff --git a/pkg/machine/gvproxy_unix.go b/pkg/machine/gvproxy_unix.go index 647572a7a0..a4d8ae13f0 100644 --- a/pkg/machine/gvproxy_unix.go +++ b/pkg/machine/gvproxy_unix.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" psutil "github.com/shirou/gopsutil/v4/process" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/pkg/machine/gvproxy_windows.go b/pkg/machine/gvproxy_windows.go index 8d572c42b1..bc22decac1 100644 --- a/pkg/machine/gvproxy_windows.go +++ b/pkg/machine/gvproxy_windows.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "github.com/containers/winquit/pkg/winquit" "github.com/sirupsen/logrus" "golang.org/x/sys/windows" diff --git a/pkg/machine/hyperv/stubber.go b/pkg/machine/hyperv/stubber.go index a537f99d16..0c7aed1600 100644 --- a/pkg/machine/hyperv/stubber.go +++ b/pkg/machine/hyperv/stubber.go @@ -13,13 +13,13 @@ import ( "github.com/Microsoft/go-winio" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/libhvee/pkg/hypervctl" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/hyperv/vsock" - "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/pkg/systemd/parser" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/hyperv/vsock" + "github.com/containers/podman/v6/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/systemd/parser" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/strongunits" ) diff --git a/pkg/machine/hyperv/volumes.go b/pkg/machine/hyperv/volumes.go index 8a4e84ed4d..61132868d5 100644 --- a/pkg/machine/hyperv/volumes.go +++ b/pkg/machine/hyperv/volumes.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/hyperv/vsock" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/hyperv/vsock" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/hyperv/vsock/vsock.go b/pkg/machine/hyperv/vsock/vsock.go index 202faafb38..ed0547e008 100644 --- a/pkg/machine/hyperv/vsock/vsock.go +++ b/pkg/machine/hyperv/vsock/vsock.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/Microsoft/go-winio" - "github.com/containers/podman/v5/pkg/machine/sockets" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine/sockets" + "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" "golang.org/x/sys/windows/registry" ) diff --git a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go index e6754132dd..fd80989afe 100644 --- a/pkg/machine/ignition/ignition.go +++ b/pkg/machine/ignition/ignition.go @@ -12,8 +12,8 @@ import ( "path/filepath" "runtime" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/systemd/parser" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/systemd/parser" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/ignition/ready.go b/pkg/machine/ignition/ready.go index 8ee5156a07..5fc38c42aa 100644 --- a/pkg/machine/ignition/ready.go +++ b/pkg/machine/ignition/ready.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) // ReadyUnitOpts are options for creating the ready unit that reports back to podman diff --git a/pkg/machine/libkrun/stubber.go b/pkg/machine/libkrun/stubber.go index 40f5ccaec1..011700e0dc 100644 --- a/pkg/machine/libkrun/stubber.go +++ b/pkg/machine/libkrun/stubber.go @@ -7,13 +7,13 @@ import ( "strconv" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/apple" - "github.com/containers/podman/v5/pkg/machine/apple/vfkit" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/apple" + "github.com/containers/podman/v6/pkg/machine/apple/vfkit" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/utils" vfConfig "github.com/crc-org/vfkit/pkg/config" ) diff --git a/pkg/machine/lock/lock.go b/pkg/machine/lock/lock.go index 0a5a05db01..e7ec1b382e 100644 --- a/pkg/machine/lock/lock.go +++ b/pkg/machine/lock/lock.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v5/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/env" "go.podman.io/storage/pkg/lockfile" ) diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go index 44773f2800..72858732a2 100644 --- a/pkg/machine/machine_common.go +++ b/pkg/machine/machine_common.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) // GetDevNullFiles returns pointers to Read-only and Write-only DevNull files diff --git a/pkg/machine/machine_windows.go b/pkg/machine/machine_windows.go index ab572cfdd6..eb279673d4 100644 --- a/pkg/machine/machine_windows.go +++ b/pkg/machine/machine_windows.go @@ -16,9 +16,9 @@ import ( "time" winio "github.com/Microsoft/go-winio" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/sockets" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/sockets" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/ocipull/oci.go b/pkg/machine/ocipull/oci.go index 0c28601ee2..0233eb14fb 100644 --- a/pkg/machine/ocipull/oci.go +++ b/pkg/machine/ocipull/oci.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/blang/semver/v4" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/version" ) type OSVersion struct { diff --git a/pkg/machine/ocipull/ociartifact.go b/pkg/machine/ocipull/ociartifact.go index 21d58307d2..9ff1acd141 100644 --- a/pkg/machine/ocipull/ociartifact.go +++ b/pkg/machine/ocipull/ociartifact.go @@ -10,9 +10,9 @@ import ( "runtime" "strings" - "github.com/containers/podman/v5/pkg/machine/compression" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine/compression" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/utils" "github.com/opencontainers/go-digest" specV1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" diff --git a/pkg/machine/ocipull/policy.go b/pkg/machine/ocipull/policy.go index d2f929e70b..6fc3a5d4e9 100644 --- a/pkg/machine/ocipull/policy.go +++ b/pkg/machine/ocipull/policy.go @@ -11,7 +11,7 @@ import ( // the shipped policy.json file is located. This can either be absolute path or a relative path. If it // is relative it will be resolved relative to the podman binary and NOT the CWD. // -// use "-X github.com/containers/podman/v5/pkg/machine/ocipull.DefaultPolicyJSONPath=/somepath" in go ldflags to overwrite this +// use "-X github.com/containers/podman/v6/pkg/machine/ocipull.DefaultPolicyJSONPath=/somepath" in go ldflags to overwrite this var DefaultPolicyJSONPath = "" const policyfile = "policy.json" diff --git a/pkg/machine/ocipull/pull.go b/pkg/machine/ocipull/pull.go index aa6aac3489..22699da961 100644 --- a/pkg/machine/ocipull/pull.go +++ b/pkg/machine/ocipull/pull.go @@ -8,7 +8,7 @@ import ( "os" "github.com/containers/buildah/pkg/parse" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "github.com/sirupsen/logrus" "go.podman.io/image/v5/copy" "go.podman.io/image/v5/oci/layout" diff --git a/pkg/machine/os/machine_os.go b/pkg/machine/os/machine_os.go index 0c787c6f8f..13a44ebebe 100644 --- a/pkg/machine/os/machine_os.go +++ b/pkg/machine/os/machine_os.go @@ -5,10 +5,10 @@ package os import ( "fmt" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/shim" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/shim" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" ) // MachineOS manages machine OS's from outside the machine. diff --git a/pkg/machine/ports/ports.go b/pkg/machine/ports/ports.go index c060a666e0..d44a436aa7 100644 --- a/pkg/machine/ports/ports.go +++ b/pkg/machine/ports/ports.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strconv" - "github.com/containers/podman/v5/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/env" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/ioutils" "go.podman.io/storage/pkg/lockfile" diff --git a/pkg/machine/provider/platform.go b/pkg/machine/provider/platform.go index e042518968..43052610df 100644 --- a/pkg/machine/provider/platform.go +++ b/pkg/machine/provider/platform.go @@ -1,9 +1,9 @@ package provider import ( - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" ) func InstalledProviders() ([]define.VMType, error) { diff --git a/pkg/machine/provider/platform_darwin.go b/pkg/machine/provider/platform_darwin.go index a6e415f07b..fc068d7411 100644 --- a/pkg/machine/provider/platform_darwin.go +++ b/pkg/machine/provider/platform_darwin.go @@ -10,10 +10,10 @@ import ( "strings" "github.com/blang/semver/v4" - "github.com/containers/podman/v5/pkg/machine/applehv" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/libkrun" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/applehv" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/libkrun" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" ) diff --git a/pkg/machine/provider/platform_test.go b/pkg/machine/provider/platform_test.go index 9ab62abb90..183fd6d758 100644 --- a/pkg/machine/provider/platform_test.go +++ b/pkg/machine/provider/platform_test.go @@ -4,7 +4,7 @@ import ( "runtime" "testing" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "github.com/stretchr/testify/assert" ) diff --git a/pkg/machine/provider/platform_unix.go b/pkg/machine/provider/platform_unix.go index 82312b8f2c..f0126c0b25 100644 --- a/pkg/machine/provider/platform_unix.go +++ b/pkg/machine/provider/platform_unix.go @@ -8,9 +8,9 @@ import ( "io/fs" "os" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/qemu" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/qemu" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" ) diff --git a/pkg/machine/provider/platform_windows.go b/pkg/machine/provider/platform_windows.go index b93212f4c9..8bbb67fc4e 100644 --- a/pkg/machine/provider/platform_windows.go +++ b/pkg/machine/provider/platform_windows.go @@ -5,12 +5,12 @@ import ( "os" "github.com/containers/libhvee/pkg/hypervctl" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/pkg/machine/wsl" - "github.com/containers/podman/v5/pkg/machine/wsl/wutil" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/wsl" + "github.com/containers/podman/v6/pkg/machine/wsl/wutil" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/hyperv" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/hyperv" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" ) diff --git a/pkg/machine/proxyenv/env.go b/pkg/machine/proxyenv/env.go index 3cc78e115b..fc08a24260 100644 --- a/pkg/machine/proxyenv/env.go +++ b/pkg/machine/proxyenv/env.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/pkg/config" diff --git a/pkg/machine/qemu/command/command.go b/pkg/machine/qemu/command/command.go index 0edd200fe5..eb2db5bcde 100644 --- a/pkg/machine/qemu/command/command.go +++ b/pkg/machine/qemu/command/command.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/qemu/command/qemu_command_test.go b/pkg/machine/qemu/command/qemu_command_test.go index 0c70f4af02..ca847fd383 100644 --- a/pkg/machine/qemu/command/qemu_command_test.go +++ b/pkg/machine/qemu/command/qemu_command_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/machine/qemu/config_test.go b/pkg/machine/qemu/config_test.go index 174aae4367..0cb75cc05e 100644 --- a/pkg/machine/qemu/config_test.go +++ b/pkg/machine/qemu/config_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) func TestUSBParsing(t *testing.T) { diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 3584706427..141452bc01 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -14,9 +14,9 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/digitalocean/go-qemu/qmp" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/machine/qemu/machine_windows.go b/pkg/machine/qemu/machine_windows.go index 71578fbdca..7375f8d34f 100644 --- a/pkg/machine/qemu/machine_windows.go +++ b/pkg/machine/qemu/machine_windows.go @@ -6,7 +6,7 @@ import ( "bytes" "fmt" - "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v6/pkg/machine" ) func isProcessAlive(pid int) bool { diff --git a/pkg/machine/qemu/stubber.go b/pkg/machine/qemu/stubber.go index c0cffb1718..97bfbc5813 100644 --- a/pkg/machine/qemu/stubber.go +++ b/pkg/machine/qemu/stubber.go @@ -14,12 +14,12 @@ import ( "time" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/podman/v5/pkg/machine/qemu/command" - "github.com/containers/podman/v5/pkg/machine/sockets" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/qemu/command" + "github.com/containers/podman/v6/pkg/machine/sockets" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/strongunits" diff --git a/pkg/machine/qemu/virtiofsd.go b/pkg/machine/qemu/virtiofsd.go index 7f358bbda8..239836f5dd 100644 --- a/pkg/machine/qemu/virtiofsd.go +++ b/pkg/machine/qemu/virtiofsd.go @@ -8,8 +8,8 @@ import ( "os/exec" "time" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/machine/shim/diskpull/diskpull.go b/pkg/machine/shim/diskpull/diskpull.go index 2facbfd5f4..cb61aed67f 100644 --- a/pkg/machine/shim/diskpull/diskpull.go +++ b/pkg/machine/shim/diskpull/diskpull.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/ocipull" - "github.com/containers/podman/v5/pkg/machine/stdpull" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/ocipull" + "github.com/containers/podman/v6/pkg/machine/stdpull" "go.podman.io/image/v5/types" ) diff --git a/pkg/machine/shim/host.go b/pkg/machine/shim/host.go index cecf29a12d..089fdb19c1 100644 --- a/pkg/machine/shim/host.go +++ b/pkg/machine/shim/host.go @@ -14,17 +14,17 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/connection" - machineDefine "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/podman/v5/pkg/machine/lock" - "github.com/containers/podman/v5/pkg/machine/provider" - "github.com/containers/podman/v5/pkg/machine/proxyenv" - "github.com/containers/podman/v5/pkg/machine/shim/diskpull" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/connection" + machineDefine "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/lock" + "github.com/containers/podman/v6/pkg/machine/provider" + "github.com/containers/podman/v6/pkg/machine/proxyenv" + "github.com/containers/podman/v6/pkg/machine/shim/diskpull" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/utils" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/shim/networking.go b/pkg/machine/shim/networking.go index b74b40d308..151e03657e 100644 --- a/pkg/machine/shim/networking.go +++ b/pkg/machine/shim/networking.go @@ -9,12 +9,12 @@ import ( "time" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/connection" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/ports" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/connection" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/ports" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" ) diff --git a/pkg/machine/shim/networking_unix.go b/pkg/machine/shim/networking_unix.go index 8912da919b..df7ae4db8e 100644 --- a/pkg/machine/shim/networking_unix.go +++ b/pkg/machine/shim/networking_unix.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/shim/networking_windows.go b/pkg/machine/shim/networking_windows.go index 962fddd2e8..e8ff59d0f9 100644 --- a/pkg/machine/shim/networking_windows.go +++ b/pkg/machine/shim/networking_windows.go @@ -3,11 +3,11 @@ package shim import ( "fmt" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - sc "github.com/containers/podman/v5/pkg/machine/sockets" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + sc "github.com/containers/podman/v6/pkg/machine/sockets" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" ) func setupMachineSockets(mc *vmconfigs.MachineConfig, _ *define.MachineDirs) ([]string, string, machine.APIForwardingState, error) { diff --git a/pkg/machine/shim/volume.go b/pkg/machine/shim/volume.go index e67e577dbe..c3f8f0b749 100644 --- a/pkg/machine/shim/volume.go +++ b/pkg/machine/shim/volume.go @@ -1,8 +1,8 @@ package shim import ( - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" ) func CmdLineVolumesToMounts(volumes []string, volumeType vmconfigs.VolumeMountType) []*vmconfigs.Mount { diff --git a/pkg/machine/sockets/sockets.go b/pkg/machine/sockets/sockets.go index 8eb252a4df..97483dc691 100644 --- a/pkg/machine/sockets/sockets.go +++ b/pkg/machine/sockets/sockets.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/stdpull/local.go b/pkg/machine/stdpull/local.go index b8d45ca92f..d258679c35 100644 --- a/pkg/machine/stdpull/local.go +++ b/pkg/machine/stdpull/local.go @@ -1,8 +1,8 @@ package stdpull import ( - "github.com/containers/podman/v5/pkg/machine/compression" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/compression" + "github.com/containers/podman/v6/pkg/machine/define" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/stdpull/url.go b/pkg/machine/stdpull/url.go index 6a07ca2028..fc574b71ed 100644 --- a/pkg/machine/stdpull/url.go +++ b/pkg/machine/stdpull/url.go @@ -11,9 +11,9 @@ import ( "path" "path/filepath" - "github.com/containers/podman/v5/pkg/machine/compression" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine/compression" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/update.go b/pkg/machine/update.go index 3886f05458..e14cdc97ae 100644 --- a/pkg/machine/update.go +++ b/pkg/machine/update.go @@ -5,8 +5,8 @@ package machine import ( "fmt" - "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/vmconfigs/config.go b/pkg/machine/vmconfigs/config.go index ad34884ade..59ffb3dd30 100644 --- a/pkg/machine/vmconfigs/config.go +++ b/pkg/machine/vmconfigs/config.go @@ -4,8 +4,8 @@ import ( "time" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/ignition" "go.podman.io/common/pkg/strongunits" "go.podman.io/storage/pkg/lockfile" ) diff --git a/pkg/machine/vmconfigs/config_common.go b/pkg/machine/vmconfigs/config_common.go index d12705f946..6d1548b6cf 100644 --- a/pkg/machine/vmconfigs/config_common.go +++ b/pkg/machine/vmconfigs/config_common.go @@ -5,8 +5,8 @@ package vmconfigs import ( "os" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/qemu/command" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/qemu/command" ) type QEMUConfig struct { diff --git a/pkg/machine/vmconfigs/config_darwin.go b/pkg/machine/vmconfigs/config_darwin.go index 359c4d392d..e149bfe88b 100644 --- a/pkg/machine/vmconfigs/config_darwin.go +++ b/pkg/machine/vmconfigs/config_darwin.go @@ -3,7 +3,7 @@ package vmconfigs import ( "os" - "github.com/containers/podman/v5/pkg/machine/apple/vfkit" + "github.com/containers/podman/v6/pkg/machine/apple/vfkit" ) type AppleHVConfig struct { diff --git a/pkg/machine/vmconfigs/config_windows.go b/pkg/machine/vmconfigs/config_windows.go index bbb694412b..0e9554aeaf 100644 --- a/pkg/machine/vmconfigs/config_windows.go +++ b/pkg/machine/vmconfigs/config_windows.go @@ -1,9 +1,9 @@ package vmconfigs import ( - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/hyperv/vsock" - "github.com/containers/podman/v5/pkg/machine/qemu/command" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/hyperv/vsock" + "github.com/containers/podman/v6/pkg/machine/qemu/command" ) type HyperVConfig struct { diff --git a/pkg/machine/vmconfigs/machine.go b/pkg/machine/vmconfigs/machine.go index a1b3eaf3ef..41d66c9f2d 100644 --- a/pkg/machine/vmconfigs/machine.go +++ b/pkg/machine/vmconfigs/machine.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/podman/v5/pkg/machine/connection" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/lock" - "github.com/containers/podman/v5/pkg/machine/ports" + "github.com/containers/podman/v6/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/machine/connection" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/lock" + "github.com/containers/podman/v6/pkg/machine/ports" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/strongunits" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/machine/vmconfigs/machine_unix.go b/pkg/machine/vmconfigs/machine_unix.go index 4dfde175db..a0ba853dd8 100644 --- a/pkg/machine/vmconfigs/machine_unix.go +++ b/pkg/machine/vmconfigs/machine_unix.go @@ -3,7 +3,7 @@ package vmconfigs import ( - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) func getPipe(_ string) *define.VMFile { diff --git a/pkg/machine/vmconfigs/machine_windows.go b/pkg/machine/vmconfigs/machine_windows.go index 1092b840ee..e8c4c3c047 100644 --- a/pkg/machine/vmconfigs/machine_windows.go +++ b/pkg/machine/vmconfigs/machine_windows.go @@ -1,8 +1,8 @@ package vmconfigs import ( - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" ) func getPipe(name string) *define.VMFile { diff --git a/pkg/machine/vmconfigs/sockets.go b/pkg/machine/vmconfigs/sockets.go index 60d2a7a2a2..20021c2529 100644 --- a/pkg/machine/vmconfigs/sockets.go +++ b/pkg/machine/vmconfigs/sockets.go @@ -5,7 +5,7 @@ package vmconfigs import ( "fmt" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) func gvProxySocket(name string, machineRuntimeDir *define.VMFile) (*define.VMFile, error) { diff --git a/pkg/machine/vmconfigs/sockets_darwin.go b/pkg/machine/vmconfigs/sockets_darwin.go index a28b10a3a1..61998aabbe 100644 --- a/pkg/machine/vmconfigs/sockets_darwin.go +++ b/pkg/machine/vmconfigs/sockets_darwin.go @@ -3,7 +3,7 @@ package vmconfigs import ( "fmt" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" ) func gvProxySocket(name string, machineRuntimeDir *define.VMFile) (*define.VMFile, error) { diff --git a/pkg/machine/volumes.go b/pkg/machine/volumes.go index 241361eb3a..f75b3606eb 100644 --- a/pkg/machine/volumes.go +++ b/pkg/machine/volumes.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "encoding/hex" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" ) // NFSSELinuxContext is what is used by NFS mounts, which is allowed diff --git a/pkg/machine/wsl/config.go b/pkg/machine/wsl/config.go index 573a267afe..836bb11d72 100644 --- a/pkg/machine/wsl/config.go +++ b/pkg/machine/wsl/config.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go index bf763b2851..795c84468d 100644 --- a/pkg/machine/wsl/machine.go +++ b/pkg/machine/wsl/machine.go @@ -14,12 +14,12 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/pkg/machine/wsl/wutil" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/wsl/wutil" + "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/strongunits" diff --git a/pkg/machine/wsl/stubber.go b/pkg/machine/wsl/stubber.go index 47edd2701d..7f6220a41c 100644 --- a/pkg/machine/wsl/stubber.go +++ b/pkg/machine/wsl/stubber.go @@ -9,14 +9,14 @@ import ( "os" "strings" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/wsl/wutil" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/wsl/wutil" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/ignition" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/wsl/usermodenet.go b/pkg/machine/wsl/usermodenet.go index 994ddc6c43..01be8ab7b7 100644 --- a/pkg/machine/wsl/usermodenet.go +++ b/pkg/machine/wsl/usermodenet.go @@ -9,11 +9,11 @@ import ( "os/exec" "path/filepath" - "github.com/containers/podman/v5/pkg/machine" - "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/podman/v5/pkg/machine/wsl/wutil" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/machine" + "github.com/containers/podman/v6/pkg/machine/env" + "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "github.com/containers/podman/v6/pkg/machine/wsl/wutil" + "github.com/containers/podman/v6/pkg/specgen" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/wsl/util_windows.go b/pkg/machine/wsl/util_windows.go index 0b65828ec8..aee283a050 100644 --- a/pkg/machine/wsl/util_windows.go +++ b/pkg/machine/wsl/util_windows.go @@ -16,7 +16,7 @@ import ( "unsafe" "github.com/Microsoft/go-winio" - "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v6/pkg/machine/define" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/homedir" diff --git a/pkg/parallel/ctr/ctr.go b/pkg/parallel/ctr/ctr.go index 1cdb30f8cd..4a42e6aac7 100644 --- a/pkg/parallel/ctr/ctr.go +++ b/pkg/parallel/ctr/ctr.go @@ -5,8 +5,8 @@ package ctr import ( "context" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/parallel" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/parallel" "github.com/sirupsen/logrus" ) diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index 0f343aca11..3494141871 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/domain/filters" - psdefine "github.com/containers/podman/v5/pkg/ps/define" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/filters" + psdefine "github.com/containers/podman/v6/pkg/ps/define" "github.com/sirupsen/logrus" libnetworkTypes "go.podman.io/common/libnetwork/types" "go.podman.io/storage" diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index 551211e290..98ac9fd36c 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -16,7 +16,7 @@ import ( "sync" "unsafe" - "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v6/pkg/errorhandling" "github.com/moby/sys/capability" "github.com/sirupsen/logrus" "go.podman.io/storage/pkg/idtools" diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index 251932590a..c3eb5ebc6e 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" ) var ( diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go index 0b7c9233d8..2a34eee905 100644 --- a/pkg/specgen/generate/config_linux.go +++ b/pkg/specgen/generate/config_linux.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" "go.podman.io/common/pkg/config" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/specgen/generate/config_linux_seccomp.go b/pkg/specgen/generate/config_linux_seccomp.go index 86f084e57a..d7b85e69e2 100644 --- a/pkg/specgen/generate/config_linux_seccomp.go +++ b/pkg/specgen/generate/config_linux_seccomp.go @@ -8,8 +8,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/pkg/seccomp" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/seccomp" + "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index 4d60cb3142..a5b5b8dec1 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -13,12 +13,12 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - ann "github.com/containers/podman/v5/pkg/annotations" - envLib "github.com/containers/podman/v5/pkg/env" - "github.com/containers/podman/v5/pkg/signal" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + ann "github.com/containers/podman/v6/pkg/annotations" + envLib "github.com/containers/podman/v6/pkg/env" + "github.com/containers/podman/v6/pkg/signal" + "github.com/containers/podman/v6/pkg/specgen" "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index d06cf7559b..fb462b312d 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -11,13 +11,13 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index 51a05130b3..d74f4ddd23 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -18,16 +18,16 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - ann "github.com/containers/podman/v5/pkg/annotations" - "github.com/containers/podman/v5/pkg/domain/entities" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgen/generate" - systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + ann "github.com/containers/podman/v6/pkg/annotations" + "github.com/containers/podman/v6/pkg/domain/entities" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgen/generate" + systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" + "github.com/containers/podman/v6/pkg/util" "github.com/docker/docker/pkg/meminfo" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/specgen/generate/kube/kube_test.go b/pkg/specgen/generate/kube/kube_test.go index a374ee8f16..c409b12cb1 100644 --- a/pkg/specgen/generate/kube/kube_test.go +++ b/pkg/specgen/generate/kube/kube_test.go @@ -5,8 +5,8 @@ package kube import ( "testing" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" "github.com/stretchr/testify/assert" ) diff --git a/pkg/specgen/generate/kube/play_test.go b/pkg/specgen/generate/kube/play_test.go index 616bcb2542..dd2c0fce0f 100644 --- a/pkg/specgen/generate/kube/play_test.go +++ b/pkg/specgen/generate/kube/play_test.go @@ -8,12 +8,12 @@ import ( "strconv" "testing" - "github.com/containers/podman/v5/libpod/define" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" - v12 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" + v12 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" + "github.com/containers/podman/v6/pkg/specgen" "github.com/docker/docker/pkg/meminfo" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" diff --git a/pkg/specgen/generate/kube/seccomp.go b/pkg/specgen/generate/kube/seccomp.go index 2bd6f8536c..4f7cf16483 100644 --- a/pkg/specgen/generate/kube/seccomp.go +++ b/pkg/specgen/generate/kube/seccomp.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/libpod" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" ) // KubeSeccompPaths holds information about a pod YAML's seccomp configuration diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go index 614610a8d8..020f01e9a7 100644 --- a/pkg/specgen/generate/kube/volume.go +++ b/pkg/specgen/generate/kube/volume.go @@ -9,8 +9,8 @@ import ( "maps" "os" - "github.com/containers/podman/v5/libpod" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/libpod" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" "go.podman.io/common/pkg/parse" "go.podman.io/common/pkg/secrets" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/specgen/generate/kube/volume_test.go b/pkg/specgen/generate/kube/volume_test.go index 8c72099965..a342ddee4b 100644 --- a/pkg/specgen/generate/kube/volume_test.go +++ b/pkg/specgen/generate/kube/volume_test.go @@ -5,7 +5,7 @@ package kube import ( "testing" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" "github.com/stretchr/testify/assert" ) diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 014d64a1ef..4e55153071 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/specgen/generate/namespaces_freebsd.go b/pkg/specgen/generate/namespaces_freebsd.go index 1d27e5b47f..af37fc38f0 100644 --- a/pkg/specgen/generate/namespaces_freebsd.go +++ b/pkg/specgen/generate/namespaces_freebsd.go @@ -7,8 +7,8 @@ import ( "os" "github.com/containers/buildah/pkg/jail" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/namespaces_linux.go b/pkg/specgen/generate/namespaces_linux.go index e29ce7cb15..1f65d97e61 100644 --- a/pkg/specgen/generate/namespaces_linux.go +++ b/pkg/specgen/generate/namespaces_linux.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index f5dcacbbb6..25eea0c897 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -5,8 +5,8 @@ package generate import ( "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/specgen/generate/oci_freebsd.go b/pkg/specgen/generate/oci_freebsd.go index 1d8f4a3016..553e7c34d2 100644 --- a/pkg/specgen/generate/oci_freebsd.go +++ b/pkg/specgen/generate/oci_freebsd.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "go.podman.io/common/libimage" diff --git a/pkg/specgen/generate/oci_linux.go b/pkg/specgen/generate/oci_linux.go index 335a82f2a2..f07a1cec48 100644 --- a/pkg/specgen/generate/oci_linux.go +++ b/pkg/specgen/generate/oci_linux.go @@ -9,10 +9,10 @@ import ( "path" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/specgen" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/specgen/generate/pause_image.go b/pkg/specgen/generate/pause_image.go index d6d80f557b..42dc9efc4c 100644 --- a/pkg/specgen/generate/pause_image.go +++ b/pkg/specgen/generate/pause_image.go @@ -5,7 +5,7 @@ package generate import ( "context" - "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v6/libpod" "go.podman.io/common/pkg/config" ) diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index fedc901975..eb2b3a74da 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutil" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/pod_create_test.go b/pkg/specgen/generate/pod_create_test.go index f571519eab..04f0209630 100644 --- a/pkg/specgen/generate/pod_create_test.go +++ b/pkg/specgen/generate/pod_create_test.go @@ -5,7 +5,7 @@ package generate import ( "net" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgen" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.podman.io/common/libnetwork/types" diff --git a/pkg/specgen/generate/ports.go b/pkg/specgen/generate/ports.go index 8be4293a8f..d60d81fd00 100644 --- a/pkg/specgen/generate/ports.go +++ b/pkg/specgen/generate/ports.go @@ -9,9 +9,9 @@ import ( "sort" "strings" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutil" + "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/types" diff --git a/pkg/specgen/generate/security_freebsd.go b/pkg/specgen/generate/security_freebsd.go index f02626a782..3ed5e99f12 100644 --- a/pkg/specgen/generate/security_freebsd.go +++ b/pkg/specgen/generate/security_freebsd.go @@ -3,8 +3,8 @@ package generate import ( - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" diff --git a/pkg/specgen/generate/security_linux.go b/pkg/specgen/generate/security_linux.go index d9afef1701..ace82ec8fd 100644 --- a/pkg/specgen/generate/security_linux.go +++ b/pkg/specgen/generate/security_linux.go @@ -7,10 +7,10 @@ import ( "slices" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go index d1f56a6a79..0a955bd6a8 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -12,10 +12,10 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" diff --git a/pkg/specgen/generate/validate_freebsd.go b/pkg/specgen/generate/validate_freebsd.go index 4ed79d459e..5e2cf95228 100644 --- a/pkg/specgen/generate/validate_freebsd.go +++ b/pkg/specgen/generate/validate_freebsd.go @@ -2,7 +2,7 @@ package generate -import "github.com/containers/podman/v5/pkg/specgen" +import "github.com/containers/podman/v6/pkg/specgen" // verifyContainerResources does nothing on freebsd as it has no cgroups func verifyContainerResources(_ *specgen.SpecGenerator) ([]string, error) { diff --git a/pkg/specgen/generate/validate_linux.go b/pkg/specgen/generate/validate_linux.go index 0fa8a91522..317854fd27 100644 --- a/pkg/specgen/generate/validate_linux.go +++ b/pkg/specgen/generate/validate_linux.go @@ -9,8 +9,8 @@ import ( "path/filepath" "reflect" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/specgen" "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/sysinfo" diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go index d3cad60f8e..128089768b 100644 --- a/pkg/specgen/namespaces.go +++ b/pkg/specgen/namespaces.go @@ -7,10 +7,10 @@ import ( "slices" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "go.podman.io/common/libnetwork/types" diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index a7437ef0a4..4db1f861e9 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -6,7 +6,7 @@ import ( "strings" "syscall" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" nettypes "go.podman.io/common/libnetwork/types" "go.podman.io/image/v5/manifest" diff --git a/pkg/specgen/volumes.go b/pkg/specgen/volumes.go index 69dbd858e1..114e1a4cfe 100644 --- a/pkg/specgen/volumes.go +++ b/pkg/specgen/volumes.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/parse" diff --git a/pkg/specgenutil/createparse.go b/pkg/specgenutil/createparse.go index 091919cff9..c4baf15f93 100644 --- a/pkg/specgenutil/createparse.go +++ b/pkg/specgenutil/createparse.go @@ -3,7 +3,7 @@ package specgenutil import ( "errors" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/common/pkg/config" ) diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index effd9accbd..6699d74fa8 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -9,14 +9,14 @@ import ( "strings" "time" - "github.com/containers/podman/v5/cmd/podman/parse" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - envLib "github.com/containers/podman/v5/pkg/env" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/specgen" - systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/cmd/podman/parse" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + envLib "github.com/containers/podman/v6/pkg/env" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/specgen" + systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" + "github.com/containers/podman/v6/pkg/util" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" diff --git a/pkg/specgenutil/specgenutil_test.go b/pkg/specgenutil/specgenutil_test.go index 41a178de49..a1f03dd9e9 100644 --- a/pkg/specgenutil/specgenutil_test.go +++ b/pkg/specgenutil/specgenutil_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgen" "github.com/stretchr/testify/assert" "go.podman.io/common/pkg/machine" ) diff --git a/pkg/specgenutil/specgenutil_windows_test.go b/pkg/specgenutil/specgenutil_windows_test.go index e011d88430..7c270b32d5 100644 --- a/pkg/specgenutil/specgenutil_windows_test.go +++ b/pkg/specgenutil/specgenutil_windows_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/specgen" "github.com/stretchr/testify/assert" ) diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go index 52086c7cb8..1cef786e7d 100644 --- a/pkg/specgenutil/volumes.go +++ b/pkg/specgenutil/volumes.go @@ -7,11 +7,11 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/podman/v5/pkg/specgenutilexternal" - "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/specgen" + "github.com/containers/podman/v6/pkg/specgenutilexternal" + "github.com/containers/podman/v6/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/parse" diff --git a/pkg/systemd/dbus.go b/pkg/systemd/dbus.go index 2c38cb34c4..eea3e93390 100644 --- a/pkg/systemd/dbus.go +++ b/pkg/systemd/dbus.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strconv" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/pkg/rootless" "github.com/coreos/go-systemd/v22/dbus" godbus "github.com/godbus/dbus/v5" "github.com/sirupsen/logrus" diff --git a/pkg/systemd/generate/common.go b/pkg/systemd/generate/common.go index 6b67bf15ab..0690bab63a 100644 --- a/pkg/systemd/generate/common.go +++ b/pkg/systemd/generate/common.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v6/pkg/systemd/define" ) // minTimeoutStopSec is the minimal stop timeout for generated systemd units. diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index 7878f80fb0..bcd7d69b2c 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -12,11 +12,11 @@ import ( "text/template" "time" - "github.com/containers/podman/v5/libpod" - libpodDefine "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/systemd/define" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/libpod" + libpodDefine "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/systemd/define" + "github.com/containers/podman/v6/version" "github.com/sirupsen/logrus" "github.com/spf13/pflag" ) diff --git a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go index db0c9113dd..ee6dbf526c 100644 --- a/pkg/systemd/generate/containers_test.go +++ b/pkg/systemd/generate/containers_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/systemd/define" "github.com/stretchr/testify/assert" ) diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index 81ca410bd8..05722177f8 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -12,10 +12,10 @@ import ( "text/template" "time" - "github.com/containers/podman/v5/libpod" - "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/podman/v5/pkg/systemd/define" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/libpod" + "github.com/containers/podman/v6/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/systemd/define" + "github.com/containers/podman/v6/version" "github.com/sirupsen/logrus" "github.com/spf13/pflag" ) diff --git a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go index 6b43a32ffb..f34edebe4c 100644 --- a/pkg/systemd/generate/pods_test.go +++ b/pkg/systemd/generate/pods_test.go @@ -5,7 +5,7 @@ package generate import ( "testing" - "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/pkg/systemd/notifyproxy/notifyproxy.go b/pkg/systemd/notifyproxy/notifyproxy.go index 069e5fdd20..25f27adc37 100644 --- a/pkg/systemd/notifyproxy/notifyproxy.go +++ b/pkg/systemd/notifyproxy/notifyproxy.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" "github.com/coreos/go-systemd/v22/daemon" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index a56a631806..28ac14af96 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -9,14 +9,14 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/pkg/specgenutilexternal" - "github.com/containers/podman/v5/pkg/systemd/parser" + "github.com/containers/podman/v6/pkg/specgenutilexternal" + "github.com/containers/podman/v6/pkg/systemd/parser" "go.podman.io/storage/pkg/regexp" ) const ( // Fixme should use - // github.com/containers/podman/v5/libpod/define.AutoUpdateLabel + // github.com/containers/podman/v6/libpod/define.AutoUpdateLabel // but it is causing bloat autoUpdateLabel = "io.containers.autoupdate" // Directory for temporary Quadlet files (sysadmin owned) diff --git a/pkg/systemd/quadlet/unitdirs.go b/pkg/systemd/quadlet/unitdirs.go index 3cd37a517d..bbdda7f792 100644 --- a/pkg/systemd/quadlet/unitdirs.go +++ b/pkg/systemd/quadlet/unitdirs.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "github.com/containers/podman/v5/pkg/logiface" + "github.com/containers/podman/v6/pkg/logiface" ) // This returns whether a file has an extension recognized as a valid Quadlet unit type. diff --git a/pkg/util/mount_opts.go b/pkg/util/mount_opts.go index e48ed1cc0a..ba8388a576 100644 --- a/pkg/util/mount_opts.go +++ b/pkg/util/mount_opts.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" ) var ( diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 5d94f0ef71..5c7fede30e 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -16,10 +16,10 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/namespaces" - "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/podman/v5/pkg/signal" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/namespaces" + "github.com/containers/podman/v6/pkg/rootless" + "github.com/containers/podman/v6/pkg/signal" securejoin "github.com/cyphar/filepath-securejoin" ruser "github.com/moby/sys/user" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go index 258451d076..65a9b2d713 100644 --- a/pkg/util/utils_linux.go +++ b/pkg/util/utils_linux.go @@ -10,8 +10,8 @@ import ( "strings" "syscall" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/rootless" "github.com/containers/psgo" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index 3f8dca5bae..822cae8ca1 100644 --- a/pkg/util/utils_supported.go +++ b/pkg/util/utils_supported.go @@ -8,7 +8,7 @@ package util import ( "path/filepath" - "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v6/pkg/rootless" "go.podman.io/storage/pkg/homedir" ) diff --git a/rpm/podman.spec b/rpm/podman.spec index 6493228d87..755a0e2823 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -36,7 +36,7 @@ %global container_base_url https://%{container_base_path} # For LDFLAGS -%global ld_project %{container_base_path}/%{name}/v5 +%global ld_project %{container_base_path}/%{name}/v6 %global ld_libpod %{ld_project}/libpod # %%{name} diff --git a/test/apiv2/01-basic.at b/test/apiv2/01-basic.at index f06021efec..8d898ac5ad 100644 --- a/test/apiv2/01-basic.at +++ b/test/apiv2/01-basic.at @@ -19,7 +19,7 @@ t HEAD libpod/_ping 200 for i in /version version; do t GET $i 200 \ .Components[0].Name="Podman Engine" \ - .Components[0].Details.APIVersion~5[0-9.-]\\+ \ + .Components[0].Details.APIVersion~6[0-9.-]\\+ \ .Components[0].Details.MinAPIVersion=4.0.0 \ .Components[0].Details.Os=linux \ .ApiVersion=1.41 \ diff --git a/test/apiv2/15-manifest.at b/test/apiv2/15-manifest.at index 630d267e79..7d39b2fb03 100644 --- a/test/apiv2/15-manifest.at +++ b/test/apiv2/15-manifest.at @@ -75,10 +75,10 @@ truncate -s 20M $WORKDIR/zeroes function test_artifacts_with_args() { # these values, ideally, are local to our caller local args="$artifact_annotations $artifact_config $artifact_config_type $artifact_exclude_titles $artifact_layer_type $artifact_type" - t POST /v5.0.0/libpod/manifests/artifacts 201 + t POST /v6.0.0/libpod/manifests/artifacts 201 local id_artifacts=$(jq -r '.Id' <<<"$output") - t PUT /v5.0.0/libpod/manifests/$id_artifacts operation='update' $args --form=listed.txt="oh yeah" --form=zeroes=@"$WORKDIR/zeroes" 200 - t POST "/v5.0.0/libpod/manifests/artifacts:latest/registry/localhost:$REGISTRY_PORT%2Fartifacts:latest?tlsVerify=false&all=true" 200 + t PUT /v6.0.0/libpod/manifests/$id_artifacts operation='update' $args --form=listed.txt="oh yeah" --form=zeroes=@"$WORKDIR/zeroes" 200 + t POST "/v6.0.0/libpod/manifests/artifacts:latest/registry/localhost:$REGISTRY_PORT%2Fartifacts:latest?tlsVerify=false&all=true" 200 local index=$(skopeo inspect --raw --tls-verify=false docker://localhost:$REGISTRY_PORT/artifacts:latest) # jq <<<"$index" @@ -165,7 +165,7 @@ function test_artifacts_with_args() { is $(jq -r '.layers[0].annotations["org.opencontainers.image.title"]'<<<"$artifact") "$expect_first_title" "org.opencontainers.image.title annotation on listed.txt layer in artifact manifest with artifact_exclude_titles arg \"${artifact_exclude_titles}\"" is $(jq -r '.layers[1].annotations["org.opencontainers.image.title"]'<<<"$artifact") "$expect_second_title" "org.opencontainers.image.title annotation on zeroes layer in artifact manifest with artifact_exclude_titles arg \"${artifact_exclude_titles}\"" - t DELETE /v5.0.0/libpod/manifests/$id_artifacts 200 + t DELETE /v6.0.0/libpod/manifests/$id_artifacts 200 } function test_artifacts() { diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2 index 33f8c9247c..4ebd771350 100755 --- a/test/apiv2/test-apiv2 +++ b/test/apiv2/test-apiv2 @@ -313,7 +313,7 @@ function t() { url=http://$HOST:$PORT case "$path" in /*) url="$url$path" ;; - libpod/*) url="$url/v5.0.0/$path" ;; + libpod/*) url="$url/v6.0.0/$path" ;; *) url="$url/v1.41/$path" ;; esac fi diff --git a/test/e2e/artifact_created_test.go b/test/e2e/artifact_created_test.go index 8c17077668..c88534ec2f 100644 --- a/test/e2e/artifact_created_test.go +++ b/test/e2e/artifact_created_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/artifact_mount_test.go b/test/e2e/artifact_mount_test.go index 5d6edd9a6e..c6bddff610 100644 --- a/test/e2e/artifact_mount_test.go +++ b/test/e2e/artifact_mount_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/artifact_test.go b/test/e2e/artifact_test.go index 37683be3a2..73a7a896b6 100644 --- a/test/e2e/artifact_test.go +++ b/test/e2e/artifact_test.go @@ -10,8 +10,8 @@ import ( "strings" "time" - . "github.com/containers/podman/v5/test/utils" - "github.com/containers/podman/v5/utils" + . "github.com/containers/podman/v6/test/utils" + "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" imgspec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index fd6d6e6b1a..73fff1b92f 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 1040fc5400..f85875cce9 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/containers/buildah/define" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/checkpoint_image_test.go b/test/e2e/checkpoint_image_test.go index 2481e2226e..bb483053eb 100644 --- a/test/e2e/checkpoint_image_test.go +++ b/test/e2e/checkpoint_image_test.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/pkg/criu" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/pkg/criu" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 26153e0cb4..6714b12815 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -14,11 +14,11 @@ import ( "time" "github.com/checkpoint-restore/go-criu/v7/stats" - "github.com/containers/podman/v5/pkg/checkpoint/crutils" - "github.com/containers/podman/v5/pkg/criu" - "github.com/containers/podman/v5/pkg/domain/entities" - . "github.com/containers/podman/v5/test/utils" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/pkg/checkpoint/crutils" + "github.com/containers/podman/v6/pkg/criu" + "github.com/containers/podman/v6/pkg/domain/entities" + . "github.com/containers/podman/v6/test/utils" + "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/cleanup_test.go b/test/e2e/cleanup_test.go index 6fe96028c9..0b3ffd39af 100644 --- a/test/e2e/cleanup_test.go +++ b/test/e2e/cleanup_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index 9e22b0ce04..1cff91e310 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 2e45559a55..7b665c7831 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -29,10 +29,10 @@ import ( "testing" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/inspect" - . "github.com/containers/podman/v5/test/utils" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/inspect" + . "github.com/containers/podman/v6/test/utils" + "github.com/containers/podman/v6/utils" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/container_clone_test.go b/test/e2e/container_clone_test.go index b974a107bb..17716227ff 100644 --- a/test/e2e/container_clone_test.go +++ b/test/e2e/container_clone_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/container_create_volume_test.go b/test/e2e/container_create_volume_test.go index 8cb0facd26..fc7b9b855b 100644 --- a/test/e2e/container_create_volume_test.go +++ b/test/e2e/container_create_volume_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/container_iface_name_test.go b/test/e2e/container_iface_name_test.go index 28b12a1293..fc2b01de6b 100644 --- a/test/e2e/container_iface_name_test.go +++ b/test/e2e/container_iface_name_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go index 756a69313f..e2592b9c72 100644 --- a/test/e2e/container_inspect_test.go +++ b/test/e2e/container_inspect_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/annotations" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/annotations" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 01c9d3f234..4ddd5f7ec3 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/libpod/define" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/libpod/define" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go index 4ecb741692..223cc1907b 100644 --- a/test/e2e/cp_test.go +++ b/test/e2e/cp_test.go @@ -9,7 +9,7 @@ import ( "os/user" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go index a3baecc360..c2a038a599 100644 --- a/test/e2e/create_staticip_test.go +++ b/test/e2e/create_staticip_test.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go index b0515db067..cbcf905864 100644 --- a/test/e2e/create_staticmac_test.go +++ b/test/e2e/create_staticmac_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage/pkg/stringid" diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index 195bfa3d17..f610f76818 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index 4eb2e6d2e1..e257040011 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -6,7 +6,7 @@ import ( "fmt" "sort" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage/pkg/stringid" diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index 58b1c8e9f1..236120a86a 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/containers/podman/v5/cmd/podman/system" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/cmd/podman/system" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage/pkg/stringid" diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 53d965ad57..15df46fc3a 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go index 579bacda0e..ff9022ff5f 100644 --- a/test/e2e/exists_test.go +++ b/test/e2e/exists_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go index 18ae177e0a..2d199d9532 100644 --- a/test/e2e/export_test.go +++ b/test/e2e/export_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/farm_test.go b/test/e2e/farm_test.go index 556746990f..c9944e75c5 100644 --- a/test/e2e/farm_test.go +++ b/test/e2e/farm_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go index 82fa1101f8..909c49d6b3 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v6/libpod/define" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v5/pkg/util" - . "github.com/containers/podman/v5/test/utils" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/pkg/util" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "sigs.k8s.io/yaml" diff --git a/test/e2e/generate_spec_test.go b/test/e2e/generate_spec_test.go index 981f912e46..f078e5e60b 100644 --- a/test/e2e/generate_spec_test.go +++ b/test/e2e/generate_spec_test.go @@ -5,7 +5,7 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index c1c5844352..0e4376a391 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go index 4d420bd243..56f2697d0b 100644 --- a/test/e2e/healthcheck_run_test.go +++ b/test/e2e/healthcheck_run_test.go @@ -9,8 +9,8 @@ import ( "strconv" "time" - "github.com/containers/podman/v5/libpod/define" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/libpod/define" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go index a69a59103f..66b987c70b 100644 --- a/test/e2e/history_test.go +++ b/test/e2e/history_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go index 71429b3ed5..c673f4a15e 100644 --- a/test/e2e/image_scp_test.go +++ b/test/e2e/image_scp_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage/pkg/homedir" diff --git a/test/e2e/image_sign_test.go b/test/e2e/image_sign_test.go index 5940aaf4a2..8ed437b8a3 100644 --- a/test/e2e/image_sign_test.go +++ b/test/e2e/image_sign_test.go @@ -7,7 +7,7 @@ import ( "os/exec" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 7d6a12a77c..41698d55fa 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" "github.com/docker/go-units" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index eac9596a33..b443aea85b 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -5,7 +5,7 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index b9dcb6873d..0fd0d27374 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -11,7 +11,7 @@ import ( "runtime" "strconv" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go index c8c544ad62..49dfe0873b 100644 --- a/test/e2e/init_test.go +++ b/test/e2e/init_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index 7451ad57c6..94828cb1f8 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/opencontainers/selinux/go-selinux" diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index 86e12857ee..ed463c4538 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -5,7 +5,7 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index 64da66c471..ec70c229a9 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 2cd569918e..dc8432a46d 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index edfad48fb0..5ec118d30f 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -6,7 +6,7 @@ import ( "fmt" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index 536d58bf32..2187e2e67d 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index a04552befc..4427c62cbf 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -8,7 +8,7 @@ import ( "os/exec" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index e2d6872564..8ed6c9955a 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" - . "github.com/containers/podman/v5/test/utils" + podmanRegistry "github.com/containers/podman/v6/hack/podman-registry-go" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go index 2d412230be..a56bf960b2 100644 --- a/test/e2e/mount_rootless_test.go +++ b/test/e2e/mount_rootless_test.go @@ -5,7 +5,7 @@ package integration import ( "slices" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go index 961e027f09..46eed8df5d 100644 --- a/test/e2e/mount_test.go +++ b/test/e2e/mount_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/negative_test.go b/test/e2e/negative_test.go index 2c097bd6e4..a06d557a2a 100644 --- a/test/e2e/negative_test.go +++ b/test/e2e/negative_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index f33c6de62b..81ef930858 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index 793edd1d91..6a7344530b 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -7,8 +7,8 @@ import ( "fmt" "net" - "github.com/containers/podman/v5/pkg/domain/entities" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/pkg/domain/entities" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 6b68ba6f12..0ef04303dc 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v5/pkg/domain/entities" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/pkg/domain/entities" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index e9451a897a..457d5dfee5 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/play_build_test.go b/test/e2e/play_build_test.go index 8aa0ca8feb..d1551629ec 100644 --- a/test/e2e/play_build_test.go +++ b/test/e2e/play_build_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 30b7cc264b..ae2a34e11a 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -21,13 +21,13 @@ import ( "text/template" "time" - "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/podman/v5/pkg/bindings/play" - v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v5/pkg/util" - . "github.com/containers/podman/v5/test/utils" - "github.com/containers/podman/v5/utils" + "github.com/containers/podman/v6/libpod/define" + "github.com/containers/podman/v6/pkg/bindings" + "github.com/containers/podman/v6/pkg/bindings/play" + v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v6/pkg/util" + . "github.com/containers/podman/v6/test/utils" + "github.com/containers/podman/v6/utils" "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/pod_clone_test.go b/test/e2e/pod_clone_test.go index a2ddd46ac4..a1e3afc7f8 100644 --- a/test/e2e/pod_clone_test.go +++ b/test/e2e/pod_clone_test.go @@ -5,7 +5,7 @@ package integration import ( "os" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 534d88423b..dac7574940 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/containers/podman/v5/pkg/util" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/pkg/util" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/opencontainers/selinux/go-selinux" diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index c76da6cd7b..199f83bb42 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -6,7 +6,7 @@ import ( "fmt" "strconv" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_initcontainers_test.go b/test/e2e/pod_initcontainers_test.go index a8458e8ea0..6b52870aab 100644 --- a/test/e2e/pod_initcontainers_test.go +++ b/test/e2e/pod_initcontainers_test.go @@ -6,8 +6,8 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v5/libpod/define" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/libpod/define" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go index e946811187..20a42e3883 100644 --- a/test/e2e/pod_inspect_test.go +++ b/test/e2e/pod_inspect_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index 7ae98d6e62..af0a4db72e 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go index 3e673dcc7f..b7eefc8d01 100644 --- a/test/e2e/pod_pause_test.go +++ b/test/e2e/pod_pause_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_pod_namespaces_test.go b/test/e2e/pod_pod_namespaces_test.go index 21409f5055..740c51a2c4 100644 --- a/test/e2e/pod_pod_namespaces_test.go +++ b/test/e2e/pod_pod_namespaces_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go index cb772a397e..120fa6fe56 100644 --- a/test/e2e/pod_prune_test.go +++ b/test/e2e/pod_prune_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index e94b52d59b..35daa2c0cb 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -6,7 +6,7 @@ import ( "fmt" "sort" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage/pkg/stringid" diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index 568147a27a..a1e44c20ca 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go index a847a53414..a835e139f5 100644 --- a/test/e2e/pod_rm_test.go +++ b/test/e2e/pod_rm_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go index 9ec7bb59b4..489a473c36 100644 --- a/test/e2e/pod_start_test.go +++ b/test/e2e/pod_start_test.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index f2259b9136..b97c87a185 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go index 3203ac25a5..1ab17eb507 100644 --- a/test/e2e/pod_stop_test.go +++ b/test/e2e/pod_stop_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go index b41e67909a..4ae26fcef1 100644 --- a/test/e2e/pod_top_test.go +++ b/test/e2e/pod_top_test.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index 5f2a71ac0b..227478166a 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 4d7fd57a4c..c0ccac0d04 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index e22550dd50..6c1af5f12f 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -8,7 +8,7 @@ import ( "sort" "strconv" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" "github.com/docker/go-units" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/pull_chunked_test.go b/test/e2e/pull_chunked_test.go index 8d05c7e6d9..a33428875c 100644 --- a/test/e2e/pull_chunked_test.go +++ b/test/e2e/pull_chunked_test.go @@ -14,7 +14,7 @@ import ( "slices" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index ea7ef6f65e..88ad61dfeb 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "runtime" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index 01fdbf3969..e674723c03 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go index e67c4ee8db..77e331fd00 100644 --- a/test/e2e/quadlet_test.go +++ b/test/e2e/quadlet_test.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "github.com/containers/podman/v5/pkg/systemd/parser" - . "github.com/containers/podman/v5/test/utils" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/pkg/systemd/parser" + . "github.com/containers/podman/v6/test/utils" + "github.com/containers/podman/v6/version" "github.com/mattn/go-shellwords" . "github.com/onsi/ginkgo/v2" diff --git a/test/e2e/rename_test.go b/test/e2e/rename_test.go index abd34abf12..01c18f3b56 100644 --- a/test/e2e/rename_test.go +++ b/test/e2e/rename_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 21090a337a..7cbe73cd1e 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index 8b4cc4d06c..0605da8dbc 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -6,7 +6,7 @@ import ( "fmt" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index fc764fd20b..6582e949b2 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_aardvark_test.go b/test/e2e/run_aardvark_test.go index 6f99743eff..7832e7b150 100644 --- a/test/e2e/run_aardvark_test.go +++ b/test/e2e/run_aardvark_test.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go index 78ecdb1cfd..aa825886c5 100644 --- a/test/e2e/run_apparmor_test.go +++ b/test/e2e/run_apparmor_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/common/pkg/apparmor" diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index fc72c24f55..83e2a36edb 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go index 9fc679c757..f9818a821e 100644 --- a/test/e2e/run_cleanup_test.go +++ b/test/e2e/run_cleanup_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go index e35c40048c..a05d72ba87 100644 --- a/test/e2e/run_cpu_test.go +++ b/test/e2e/run_cpu_test.go @@ -5,7 +5,7 @@ package integration import ( "os" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go index d41610de4b..665e9d860c 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index 21b347d677..3bd584e544 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index d4f8363bb6..cc839479af 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go index f7a2851fd0..cf8dd0eadc 100644 --- a/test/e2e/run_env_test.go +++ b/test/e2e/run_env_test.go @@ -5,7 +5,7 @@ package integration import ( "os" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go index 618059b133..2e945e40c4 100644 --- a/test/e2e/run_exit_test.go +++ b/test/e2e/run_exit_test.go @@ -5,8 +5,8 @@ package integration import ( "fmt" - "github.com/containers/podman/v5/libpod/define" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/libpod/define" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index 4e9cf5c32a..40eb76f343 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 7fd84d90d4..3088c6011a 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -14,8 +14,8 @@ import ( "syscall" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containers/podman/v5/pkg/domain/entities" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/pkg/domain/entities" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index 3cae4592ab..6f0cffb44d 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go index 7c064bebd8..090a7ecdf9 100644 --- a/test/e2e/run_passwd_test.go +++ b/test/e2e/run_passwd_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go index 67370991d4..20bcb7d09c 100644 --- a/test/e2e/run_privileged_test.go +++ b/test/e2e/run_privileged_test.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" "github.com/moby/sys/capability" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index f4a62a3b95..4d70159be1 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_seccomp_test.go b/test/e2e/run_seccomp_test.go index 82a7a42831..40942ad3bb 100644 --- a/test/e2e/run_seccomp_test.go +++ b/test/e2e/run_seccomp_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_security_labels_test.go b/test/e2e/run_security_labels_test.go index 1d13460673..7d90a14a0b 100644 --- a/test/e2e/run_security_labels_test.go +++ b/test/e2e/run_security_labels_test.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go index dad1eb4e4f..5752ec02fd 100644 --- a/test/e2e/run_selinux_test.go +++ b/test/e2e/run_selinux_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/opencontainers/selinux/go-selinux" diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index 363dcf602a..ffd9030d10 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "golang.org/x/sys/unix" diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go index a410e6a7bb..a18222c154 100644 --- a/test/e2e/run_staticip_test.go +++ b/test/e2e/run_staticip_test.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage/pkg/stringid" diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 2b40ce5abe..e49336692e 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -13,8 +13,8 @@ import ( "syscall" "time" - "github.com/containers/podman/v5/libpod/define" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/libpod/define" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_transient_test.go b/test/e2e/run_transient_test.go index fa78907fa8..4d5189863c 100644 --- a/test/e2e/run_transient_test.go +++ b/test/e2e/run_transient_test.go @@ -5,7 +5,7 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index ca1c1aa740..3dff18598a 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage" diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index bc72019659..f87de2d886 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_working_dir_test.go b/test/e2e/run_working_dir_test.go index b002af7885..1d73aeb86b 100644 --- a/test/e2e/run_working_dir_test.go +++ b/test/e2e/run_working_dir_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index c2eac029e8..c1bd0b7b19 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index 6f93bae271..8243977874 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index 6e03ad4045..8966aecc14 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -10,8 +10,8 @@ import ( "strconv" "text/template" - "github.com/containers/podman/v5/pkg/domain/entities" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/pkg/domain/entities" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go index c31b8591ad..c09b1b9c1e 100644 --- a/test/e2e/secret_test.go +++ b/test/e2e/secret_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage/pkg/stringid" diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index 0be4403580..7d06fd864a 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index 446cd21e8e..fa6b026f56 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index 5cd14d119b..53d48fc78f 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go index 1dbd36922a..be01f45919 100644 --- a/test/e2e/system_connection_test.go +++ b/test/e2e/system_connection_test.go @@ -19,7 +19,7 @@ import ( "strings" "time" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go index dd1d715fd2..4af544f5bb 100644 --- a/test/e2e/system_df_test.go +++ b/test/e2e/system_df_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/system_dial_stdio_test.go b/test/e2e/system_dial_stdio_test.go index 3fffb7faea..8d0a96e3fa 100644 --- a/test/e2e/system_dial_stdio_test.go +++ b/test/e2e/system_dial_stdio_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go index 46bdac08e3..48aebbc4cc 100644 --- a/test/e2e/system_reset_test.go +++ b/test/e2e/system_reset_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/systemd_activate_test.go b/test/e2e/systemd_activate_test.go index c15c80ba4f..0d02cf12df 100644 --- a/test/e2e/systemd_activate_test.go +++ b/test/e2e/systemd_activate_test.go @@ -14,8 +14,8 @@ import ( "syscall" "time" - testUtils "github.com/containers/podman/v5/test/utils" - podmanUtils "github.com/containers/podman/v5/utils" + testUtils "github.com/containers/podman/v6/test/utils" + podmanUtils "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index 05c46021e0..e2dac181e4 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go index 81c692b0f1..b50bc32f00 100644 --- a/test/e2e/tag_test.go +++ b/test/e2e/tag_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go index b24650b56c..83ed3d60f4 100644 --- a/test/e2e/toolbox_test.go +++ b/test/e2e/toolbox_test.go @@ -36,8 +36,8 @@ import ( "strings" "syscall" - "github.com/containers/podman/v5/libpod/define" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/libpod/define" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go index 2fbac24a97..fa09fa4f00 100644 --- a/test/e2e/top_test.go +++ b/test/e2e/top_test.go @@ -6,7 +6,7 @@ import ( "os" "os/user" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go index 03aa72e06d..6bb1d4385d 100644 --- a/test/e2e/tree_test.go +++ b/test/e2e/tree_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go index 7f565044f9..68e0c48c4b 100644 --- a/test/e2e/trust_test.go +++ b/test/e2e/trust_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/unshare_test.go b/test/e2e/unshare_test.go index 1d5e6cf23c..aae8e66bab 100644 --- a/test/e2e/unshare_test.go +++ b/test/e2e/unshare_test.go @@ -5,7 +5,7 @@ package integration import ( "os" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go index 5aa8cf91ec..384be91943 100644 --- a/test/e2e/untag_test.go +++ b/test/e2e/untag_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/update_test.go b/test/e2e/update_test.go index 167a63ab78..988aa0335c 100644 --- a/test/e2e/update_test.go +++ b/test/e2e/update_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index d14a672825..dd7ac3634d 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -5,8 +5,8 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" - "github.com/containers/podman/v5/version" + . "github.com/containers/podman/v6/test/utils" + "github.com/containers/podman/v6/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go index a9e7d88c83..ba6003f6d8 100644 --- a/test/e2e/volume_create_test.go +++ b/test/e2e/volume_create_test.go @@ -6,7 +6,7 @@ import ( "fmt" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_exists_test.go b/test/e2e/volume_exists_test.go index 9fabf3eb47..d959d668bf 100644 --- a/test/e2e/volume_exists_test.go +++ b/test/e2e/volume_exists_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage/pkg/stringid" diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go index c78f2429c9..4940781184 100644 --- a/test/e2e/volume_inspect_test.go +++ b/test/e2e/volume_inspect_test.go @@ -3,8 +3,8 @@ package integration import ( - "github.com/containers/podman/v5/libpod/define" - . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v6/libpod/define" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go index 27dce14202..9db0eeb39f 100644 --- a/test/e2e/volume_ls_test.go +++ b/test/e2e/volume_ls_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/volume_plugin_test.go b/test/e2e/volume_plugin_test.go index d12cc454ad..28df87c5dc 100644 --- a/test/e2e/volume_plugin_test.go +++ b/test/e2e/volume_plugin_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/storage/pkg/stringid" diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go index f293f38729..d59dafd988 100644 --- a/test/e2e/volume_prune_test.go +++ b/test/e2e/volume_prune_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go index 28d45dc37a..3955a8059e 100644 --- a/test/e2e/volume_rm_test.go +++ b/test/e2e/volume_rm_test.go @@ -5,7 +5,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index 4e37b925f0..c7bc2fe300 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -3,7 +3,7 @@ package integration import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/testvol/util.go b/test/testvol/util.go index 57175f8b59..12d54b40b3 100644 --- a/test/testvol/util.go +++ b/test/testvol/util.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v5/libpod/plugin" + "github.com/containers/podman/v6/libpod/plugin" ) const pluginSockDir = "/run/docker/plugins" diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go index 988e83b1b2..8db40bf1f0 100644 --- a/test/utils/common_function_test.go +++ b/test/utils/common_function_test.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/utils/podmansession_test.go b/test/utils/podmansession_test.go index 0f8b65dd17..807dcc2391 100644 --- a/test/utils/podmansession_test.go +++ b/test/utils/podmansession_test.go @@ -1,7 +1,7 @@ package utils_test import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/utils/podmantest_test.go b/test/utils/podmantest_test.go index e4288d9df9..26e89490ca 100644 --- a/test/utils/podmantest_test.go +++ b/test/utils/podmantest_test.go @@ -1,7 +1,7 @@ package utils_test import ( - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/utils/utils_suite_test.go b/test/utils/utils_suite_test.go index cd732b8de8..7d790e3b74 100644 --- a/test/utils/utils_suite_test.go +++ b/test/utils/utils_suite_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - . "github.com/containers/podman/v5/test/utils" + . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/test/version/main.go b/test/version/main.go index b1e8f8ac18..78a4fc0710 100644 --- a/test/version/main.go +++ b/test/version/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/containers/podman/v5/version" + "github.com/containers/podman/v6/version" ) func main() { diff --git a/version/rawversion/version.go b/version/rawversion/version.go index f4360c663e..7deebabb6c 100644 --- a/version/rawversion/version.go +++ b/version/rawversion/version.go @@ -4,4 +4,4 @@ package rawversion // // This indirection is needed to prevent semver packages from bloating // Quadlet's binary size. -const RawVersion = "5.7.0-dev" +const RawVersion = "6.0.0-dev" diff --git a/version/version.go b/version/version.go index bb35b6c73d..10392535e7 100644 --- a/version/version.go +++ b/version/version.go @@ -2,7 +2,7 @@ package version import ( "github.com/blang/semver/v4" - "github.com/containers/podman/v5/version/rawversion" + "github.com/containers/podman/v6/version/rawversion" ) type ( diff --git a/winmake.ps1 b/winmake.ps1 index 748d916c58..7e75f37b5e 100644 --- a/winmake.ps1 +++ b/winmake.ps1 @@ -26,9 +26,9 @@ function Podman-Remote { New-Item -ItemType Directory -Force -Path './bin/windows' $buildInfo = Get-Date -UFormat %s -Millisecond 0 - $buildInfo = "-X github.com/containers/podman/v5/libpod/define.buildInfo=$buildInfo " + $buildInfo = "-X github.com/containers/podman/v6/libpod/define.buildInfo=$buildInfo " $commit = Git-Commit - $commit = "-X github.com/containers/podman/v5/libpod/define.gitCommit=$commit " + $commit = "-X github.com/containers/podman/v6/libpod/define.gitCommit=$commit " $ENV:GOARCH = $architecture Run-Command "go build --ldflags `"$commit $buildInfo `" --tags `"$remotetags`" --o ./bin/windows/podman.exe ./cmd/podman/."