summaryrefslogtreecommitdiff
path: root/pkg/api/handlers
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2022-01-18 10:14:48 +0100
committerValentin Rothberg <rothberg@redhat.com>2022-01-18 12:47:07 +0100
commitbd09b7aa79aee34608e71fd4ba90d157dae828fc (patch)
tree0ae61e3b0161c9057dfdcf84a9f5afe250dd9b95 /pkg/api/handlers
parentd6b0720b9cd5d993dffc229e73d8377aae2c2ed4 (diff)
downloadpodman-bd09b7aa79aee34608e71fd4ba90d157dae828fc.tar.gz
podman-bd09b7aa79aee34608e71fd4ba90d157dae828fc.tar.bz2
podman-bd09b7aa79aee34608e71fd4ba90d157dae828fc.zip
bump go module to version 4
Automated for .go files via gomove [1]: `gomove github.com/containers/podman/v3 github.com/containers/podman/v4` Remaining files via vgrep [2]: `vgrep github.com/containers/podman/v3` [1] https://github.com/KSubedi/gomove [2] https://github.com/vrothberg/vgrep Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r--pkg/api/handlers/compat/auth.go8
-rw-r--r--pkg/api/handlers/compat/changes.go8
-rw-r--r--pkg/api/handlers/compat/containers.go22
-rw-r--r--pkg/api/handlers/compat/containers_archive.go14
-rw-r--r--pkg/api/handlers/compat/containers_attach.go10
-rw-r--r--pkg/api/handlers/compat/containers_create.go18
-rw-r--r--pkg/api/handlers/compat/containers_export.go6
-rw-r--r--pkg/api/handlers/compat/containers_logs.go10
-rw-r--r--pkg/api/handlers/compat/containers_pause.go6
-rw-r--r--pkg/api/handlers/compat/containers_prune.go14
-rw-r--r--pkg/api/handlers/compat/containers_restart.go12
-rw-r--r--pkg/api/handlers/compat/containers_start.go8
-rw-r--r--pkg/api/handlers/compat/containers_stats.go8
-rw-r--r--pkg/api/handlers/compat/containers_stop.go12
-rw-r--r--pkg/api/handlers/compat/containers_top.go8
-rw-r--r--pkg/api/handlers/compat/containers_unpause.go6
-rw-r--r--pkg/api/handlers/compat/events.go12
-rw-r--r--pkg/api/handlers/compat/exec.go14
-rw-r--r--pkg/api/handlers/compat/images.go14
-rw-r--r--pkg/api/handlers/compat/images_build.go10
-rw-r--r--pkg/api/handlers/compat/images_history.go8
-rw-r--r--pkg/api/handlers/compat/images_prune.go14
-rw-r--r--pkg/api/handlers/compat/images_push.go12
-rw-r--r--pkg/api/handlers/compat/images_remove.go10
-rw-r--r--pkg/api/handlers/compat/images_search.go12
-rw-r--r--pkg/api/handlers/compat/images_tag.go6
-rw-r--r--pkg/api/handlers/compat/info.go12
-rw-r--r--pkg/api/handlers/compat/networks.go14
-rw-r--r--pkg/api/handlers/compat/resize.go8
-rw-r--r--pkg/api/handlers/compat/secrets.go12
-rw-r--r--pkg/api/handlers/compat/swagger.go2
-rw-r--r--pkg/api/handlers/compat/system.go12
-rw-r--r--pkg/api/handlers/compat/unsupported.go4
-rw-r--r--pkg/api/handlers/compat/version.go14
-rw-r--r--pkg/api/handlers/compat/volumes.go16
-rw-r--r--pkg/api/handlers/decoder.go4
-rw-r--r--pkg/api/handlers/libpod/containers.go16
-rw-r--r--pkg/api/handlers/libpod/containers_create.go12
-rw-r--r--pkg/api/handlers/libpod/containers_stats.go12
-rw-r--r--pkg/api/handlers/libpod/generate.go12
-rw-r--r--pkg/api/handlers/libpod/healthcheck.go8
-rw-r--r--pkg/api/handlers/libpod/images.go22
-rw-r--r--pkg/api/handlers/libpod/images_pull.go12
-rw-r--r--pkg/api/handlers/libpod/info.go8
-rw-r--r--pkg/api/handlers/libpod/manifests.go16
-rw-r--r--pkg/api/handlers/libpod/networks.go14
-rw-r--r--pkg/api/handlers/libpod/play.go12
-rw-r--r--pkg/api/handlers/libpod/pods.go22
-rw-r--r--pkg/api/handlers/libpod/secrets.go10
-rw-r--r--pkg/api/handlers/libpod/swagger.go6
-rw-r--r--pkg/api/handlers/libpod/system.go12
-rw-r--r--pkg/api/handlers/libpod/volumes.go20
-rw-r--r--pkg/api/handlers/swagger/swagger.go8
-rw-r--r--pkg/api/handlers/types.go2
-rw-r--r--pkg/api/handlers/types/types.go2
-rw-r--r--pkg/api/handlers/utils/containers.go14
-rw-r--r--pkg/api/handlers/utils/errors.go4
-rw-r--r--pkg/api/handlers/utils/handler.go2
-rw-r--r--pkg/api/handlers/utils/handler_test.go2
-rw-r--r--pkg/api/handlers/utils/images.go6
60 files changed, 317 insertions, 317 deletions
diff --git a/pkg/api/handlers/compat/auth.go b/pkg/api/handlers/compat/auth.go
index cf53e060c..4c4ad8afd 100644
--- a/pkg/api/handlers/compat/auth.go
+++ b/pkg/api/handlers/compat/auth.go
@@ -9,10 +9,10 @@ import (
DockerClient "github.com/containers/image/v5/docker"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
docker "github.com/docker/docker/api/types"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/changes.go b/pkg/api/handlers/compat/changes.go
index fe580437d..f26f239dc 100644
--- a/pkg/api/handlers/compat/changes.go
+++ b/pkg/api/handlers/compat/changes.go
@@ -3,10 +3,10 @@ package compat
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 4539199d3..94393886f 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -10,17 +10,17 @@ import (
"syscall"
"time"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/filters"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/ps"
- "github.com/containers/podman/v3/pkg/signal"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/filters"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/ps"
+ "github.com/containers/podman/v4/pkg/signal"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/docker/docker/api/types"
"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 54cbe01e9..a0e3c6d02 100644
--- a/pkg/api/handlers/compat/containers_archive.go
+++ b/pkg/api/handlers/compat/containers_archive.go
@@ -6,13 +6,13 @@ import (
"net/http"
"os"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/copy"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/copy"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
"github.com/gorilla/schema"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/compat/containers_attach.go b/pkg/api/handlers/compat/containers_attach.go
index 40d5e2d4d..ccdf054b9 100644
--- a/pkg/api/handlers/compat/containers_attach.go
+++ b/pkg/api/handlers/compat/containers_attach.go
@@ -3,11 +3,11 @@ package compat
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- "github.com/containers/podman/v3/pkg/api/server/idle"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ "github.com/containers/podman/v4/pkg/api/server/idle"
+ api "github.com/containers/podman/v4/pkg/api/types"
"github.com/gorilla/schema"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go
index 8837e08ca..467231150 100644
--- a/pkg/api/handlers/compat/containers_create.go
+++ b/pkg/api/handlers/compat/containers_create.go
@@ -4,15 +4,15 @@ import (
"encoding/json"
"net/http"
- "github.com/containers/podman/v3/cmd/podman/common"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/specgen"
- "github.com/containers/podman/v3/pkg/specgenutil"
+ "github.com/containers/podman/v4/cmd/podman/common"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/specgen"
+ "github.com/containers/podman/v4/pkg/specgenutil"
"github.com/containers/storage"
"github.com/gorilla/schema"
"github.com/pkg/errors"
diff --git a/pkg/api/handlers/compat/containers_export.go b/pkg/api/handlers/compat/containers_export.go
index 6b43a544b..8be1dcf99 100644
--- a/pkg/api/handlers/compat/containers_export.go
+++ b/pkg/api/handlers/compat/containers_export.go
@@ -5,9 +5,9 @@ import (
"net/http"
"os"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go
index 4adcaa511..20f71a4fe 100644
--- a/pkg/api/handlers/compat/containers_logs.go
+++ b/pkg/api/handlers/compat/containers_logs.go
@@ -10,11 +10,11 @@ import (
"sync"
"time"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/logs"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/logs"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/gorilla/schema"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/compat/containers_pause.go b/pkg/api/handlers/compat/containers_pause.go
index 99c2f6bdc..91aca2b3f 100644
--- a/pkg/api/handlers/compat/containers_pause.go
+++ b/pkg/api/handlers/compat/containers_pause.go
@@ -3,9 +3,9 @@ package compat
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/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 9fa8bc9f4..2a2c9f678 100644
--- a/pkg/api/handlers/compat/containers_prune.go
+++ b/pkg/api/handlers/compat/containers_prune.go
@@ -4,13 +4,13 @@ import (
"bytes"
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities/reports"
- "github.com/containers/podman/v3/pkg/domain/filters"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities/reports"
+ "github.com/containers/podman/v4/pkg/domain/filters"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/containers_restart.go b/pkg/api/handlers/compat/containers_restart.go
index 8ef2ff308..66bca23e6 100644
--- a/pkg/api/handlers/compat/containers_restart.go
+++ b/pkg/api/handlers/compat/containers_restart.go
@@ -3,12 +3,12 @@ package compat
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go
index fb68389bc..0b7f5160a 100644
--- a/pkg/api/handlers/compat/containers_start.go
+++ b/pkg/api/handlers/compat/containers_start.go
@@ -3,12 +3,12 @@ package compat
import (
"net/http"
- api "github.com/containers/podman/v3/pkg/api/types"
+ api "github.com/containers/podman/v4/pkg/api/types"
"github.com/sirupsen/logrus"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
"github.com/gorilla/schema"
)
diff --git a/pkg/api/handlers/compat/containers_stats.go b/pkg/api/handlers/compat/containers_stats.go
index ad91a3a8e..c770a03f5 100644
--- a/pkg/api/handlers/compat/containers_stats.go
+++ b/pkg/api/handlers/compat/containers_stats.go
@@ -6,10 +6,10 @@ import (
"time"
"github.com/containers/common/pkg/cgroups"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
docker "github.com/docker/docker/api/types"
"github.com/gorilla/schema"
"github.com/pkg/errors"
diff --git a/pkg/api/handlers/compat/containers_stop.go b/pkg/api/handlers/compat/containers_stop.go
index 10ac67f76..5bc3a34ac 100644
--- a/pkg/api/handlers/compat/containers_stop.go
+++ b/pkg/api/handlers/compat/containers_stop.go
@@ -3,12 +3,12 @@ package compat
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/containers_top.go b/pkg/api/handlers/compat/containers_top.go
index 545320ad9..6970cabe3 100644
--- a/pkg/api/handlers/compat/containers_top.go
+++ b/pkg/api/handlers/compat/containers_top.go
@@ -7,10 +7,10 @@ import (
"strings"
"time"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
"github.com/gorilla/schema"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/compat/containers_unpause.go b/pkg/api/handlers/compat/containers_unpause.go
index 3f4f2f531..67409bc8d 100644
--- a/pkg/api/handlers/compat/containers_unpause.go
+++ b/pkg/api/handlers/compat/containers_unpause.go
@@ -3,9 +3,9 @@ package compat
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/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 bc31a36c4..cdee56aee 100644
--- a/pkg/api/handlers/compat/events.go
+++ b/pkg/api/handlers/compat/events.go
@@ -3,12 +3,12 @@ package compat
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/events"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/events"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/gorilla/schema"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
diff --git a/pkg/api/handlers/compat/exec.go b/pkg/api/handlers/compat/exec.go
index 76f720bf2..c1ace5a38 100644
--- a/pkg/api/handlers/compat/exec.go
+++ b/pkg/api/handlers/compat/exec.go
@@ -6,13 +6,13 @@ import (
"net/http"
"strings"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- "github.com/containers/podman/v3/pkg/api/server/idle"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/specgenutil"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ "github.com/containers/podman/v4/pkg/api/server/idle"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/specgenutil"
"github.com/gorilla/mux"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index f08a7ee41..97fa4ddad 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -14,13 +14,13 @@ import (
"github.com/containers/common/pkg/filters"
"github.com/containers/image/v5/manifest"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/auth"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/auth"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
"github.com/containers/storage"
"github.com/gorilla/schema"
"github.com/opencontainers/go-digest"
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index 6d4fe5513..d9c9558e5 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -17,11 +17,11 @@ import (
buildahDefine "github.com/containers/buildah/define"
"github.com/containers/buildah/pkg/parse"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/auth"
- "github.com/containers/podman/v3/pkg/channel"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/auth"
+ "github.com/containers/podman/v4/pkg/channel"
"github.com/containers/storage/pkg/archive"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/gorilla/schema"
diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go
index fb3c2ebd2..dfaea0a76 100644
--- a/pkg/api/handlers/compat/images_history.go
+++ b/pkg/api/handlers/compat/images_history.go
@@ -3,10 +3,10 @@ package compat
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/images_prune.go b/pkg/api/handlers/compat/images_prune.go
index 5728c83c7..8fbf97248 100644
--- a/pkg/api/handlers/compat/images_prune.go
+++ b/pkg/api/handlers/compat/images_prune.go
@@ -5,13 +5,13 @@ import (
"fmt"
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/docker/docker/api/types"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go
index 04cad204d..6d4a8cdcf 100644
--- a/pkg/api/handlers/compat/images_push.go
+++ b/pkg/api/handlers/compat/images_push.go
@@ -8,12 +8,12 @@ import (
"strings"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/auth"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/auth"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
"github.com/containers/storage"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/gorilla/schema"
diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go
index 5c06d8de0..df4644b2a 100644
--- a/pkg/api/handlers/compat/images_remove.go
+++ b/pkg/api/handlers/compat/images_remove.go
@@ -3,11 +3,11 @@ package compat
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
"github.com/containers/storage"
"github.com/gorilla/schema"
"github.com/pkg/errors"
diff --git a/pkg/api/handlers/compat/images_search.go b/pkg/api/handlers/compat/images_search.go
index f6ad86a04..cdf7b12ab 100644
--- a/pkg/api/handlers/compat/images_search.go
+++ b/pkg/api/handlers/compat/images_search.go
@@ -5,12 +5,12 @@ import (
"net/http"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/auth"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/auth"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
"github.com/containers/storage"
"github.com/gorilla/schema"
"github.com/pkg/errors"
diff --git a/pkg/api/handlers/compat/images_tag.go b/pkg/api/handlers/compat/images_tag.go
index 3fe13e2f5..ce6b1de58 100644
--- a/pkg/api/handlers/compat/images_tag.go
+++ b/pkg/api/handlers/compat/images_tag.go
@@ -5,9 +5,9 @@ import (
"net/http"
"github.com/containers/common/libimage"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go
index dac1eb193..42a513002 100644
--- a/pkg/api/handlers/compat/info.go
+++ b/pkg/api/handlers/compat/info.go
@@ -11,12 +11,12 @@ import (
"github.com/containers/common/pkg/config"
"github.com/containers/common/pkg/sysinfo"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/rootless"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/rootless"
docker "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/registry"
"github.com/docker/docker/api/types/swarm"
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go
index 3345a9cfe..90a8b3c12 100644
--- a/pkg/api/handlers/compat/networks.go
+++ b/pkg/api/handlers/compat/networks.go
@@ -8,13 +8,13 @@ import (
nettypes "github.com/containers/common/libnetwork/types"
netutil "github.com/containers/common/libnetwork/util"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/docker/docker/api/types"
dockerNetwork "github.com/docker/docker/api/types/network"
diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go
index d7796658b..373d76f6b 100644
--- a/pkg/api/handlers/compat/resize.go
+++ b/pkg/api/handlers/compat/resize.go
@@ -5,10 +5,10 @@ import (
"net/http"
"strings"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
"github.com/gorilla/mux"
"github.com/gorilla/schema"
"github.com/pkg/errors"
diff --git a/pkg/api/handlers/compat/secrets.go b/pkg/api/handlers/compat/secrets.go
index 52cfe03ba..b298ae626 100644
--- a/pkg/api/handlers/compat/secrets.go
+++ b/pkg/api/handlers/compat/secrets.go
@@ -7,12 +7,12 @@ import (
"fmt"
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/compat/swagger.go b/pkg/api/handlers/compat/swagger.go
index 32167d6b5..86527da6e 100644
--- a/pkg/api/handlers/compat/swagger.go
+++ b/pkg/api/handlers/compat/swagger.go
@@ -1,7 +1,7 @@
package compat
import (
- "github.com/containers/podman/v3/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/entities"
"github.com/docker/docker/api/types"
)
diff --git a/pkg/api/handlers/compat/system.go b/pkg/api/handlers/compat/system.go
index 1e78db181..97bc9eac2 100644
--- a/pkg/api/handlers/compat/system.go
+++ b/pkg/api/handlers/compat/system.go
@@ -4,12 +4,12 @@ import (
"net/http"
"strings"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
docker "github.com/docker/docker/api/types"
)
diff --git a/pkg/api/handlers/compat/unsupported.go b/pkg/api/handlers/compat/unsupported.go
index 508d0ee18..2217e87c3 100644
--- a/pkg/api/handlers/compat/unsupported.go
+++ b/pkg/api/handlers/compat/unsupported.go
@@ -4,8 +4,8 @@ import (
"fmt"
"net/http"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- "github.com/containers/podman/v3/pkg/errorhandling"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ "github.com/containers/podman/v4/pkg/errorhandling"
log "github.com/sirupsen/logrus"
)
diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go
index 01cbb252c..c526a5aa2 100644
--- a/pkg/api/handlers/compat/version.go
+++ b/pkg/api/handlers/compat/version.go
@@ -6,13 +6,13 @@ import (
goRuntime "runtime"
"time"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/entities/types"
- "github.com/containers/podman/v3/version"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/entities/types"
+ "github.com/containers/podman/v4/version"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go
index e779aa185..352b5c7c3 100644
--- a/pkg/api/handlers/compat/volumes.go
+++ b/pkg/api/handlers/compat/volumes.go
@@ -7,14 +7,14 @@ import (
"net/url"
"time"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/filters"
- "github.com/containers/podman/v3/pkg/domain/infra/abi/parse"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/filters"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi/parse"
+ "github.com/containers/podman/v4/pkg/util"
docker_api_types "github.com/docker/docker/api/types"
docker_api_types_volume "github.com/docker/docker/api/types/volume"
"github.com/gorilla/schema"
diff --git a/pkg/api/handlers/decoder.go b/pkg/api/handlers/decoder.go
index 764456dd4..5e8f12960 100644
--- a/pkg/api/handlers/decoder.go
+++ b/pkg/api/handlers/decoder.go
@@ -6,8 +6,8 @@ import (
"syscall"
"time"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/gorilla/schema"
"github.com/sirupsen/logrus"
)
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
index 21c72bbda..2a0af6976 100644
--- a/pkg/api/handlers/libpod/containers.go
+++ b/pkg/api/handlers/libpod/containers.go
@@ -7,14 +7,14 @@ import (
"os"
"strings"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/compat"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/compat"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/gorilla/schema"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go
index d1841769a..d579cc032 100644
--- a/pkg/api/handlers/libpod/containers_create.go
+++ b/pkg/api/handlers/libpod/containers_create.go
@@ -5,12 +5,12 @@ import (
"encoding/json"
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/specgen"
- "github.com/containers/podman/v3/pkg/specgen/generate"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/specgen"
+ "github.com/containers/podman/v4/pkg/specgen/generate"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/libpod/containers_stats.go b/pkg/api/handlers/libpod/containers_stats.go
index 016214aa2..d808bf1c0 100644
--- a/pkg/api/handlers/libpod/containers_stats.go
+++ b/pkg/api/handlers/libpod/containers_stats.go
@@ -5,12 +5,12 @@ import (
"net/http"
"github.com/containers/common/pkg/cgroups"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/rootless"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/rootless"
"github.com/gorilla/schema"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go
index 88fd69d45..aadb5ad52 100644
--- a/pkg/api/handlers/libpod/generate.go
+++ b/pkg/api/handlers/libpod/generate.go
@@ -3,12 +3,12 @@ package libpod
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/libpod/healthcheck.go b/pkg/api/handlers/libpod/healthcheck.go
index cad4378e5..ba6e81bf1 100644
--- a/pkg/api/handlers/libpod/healthcheck.go
+++ b/pkg/api/handlers/libpod/healthcheck.go
@@ -3,10 +3,10 @@ package libpod
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/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 d3dbf3023..f9aade0ec 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -14,17 +14,17 @@ import (
"github.com/containers/common/libimage"
"github.com/containers/image/v5/manifest"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/auth"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/errorhandling"
- "github.com/containers/podman/v3/pkg/util"
- utils2 "github.com/containers/podman/v3/utils"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/auth"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/errorhandling"
+ "github.com/containers/podman/v4/pkg/util"
+ utils2 "github.com/containers/podman/v4/utils"
"github.com/containers/storage"
"github.com/gorilla/schema"
"github.com/pkg/errors"
diff --git a/pkg/api/handlers/libpod/images_pull.go b/pkg/api/handlers/libpod/images_pull.go
index 518e7cc65..945c5947a 100644
--- a/pkg/api/handlers/libpod/images_pull.go
+++ b/pkg/api/handlers/libpod/images_pull.go
@@ -8,12 +8,12 @@ import (
"github.com/containers/common/libimage"
"github.com/containers/common/pkg/config"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/auth"
- "github.com/containers/podman/v3/pkg/channel"
- "github.com/containers/podman/v3/pkg/domain/entities"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/auth"
+ "github.com/containers/podman/v4/pkg/channel"
+ "github.com/containers/podman/v4/pkg/domain/entities"
"github.com/gorilla/schema"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/libpod/info.go b/pkg/api/handlers/libpod/info.go
index 67dc8637c..a8c0cf1d8 100644
--- a/pkg/api/handlers/libpod/info.go
+++ b/pkg/api/handlers/libpod/info.go
@@ -3,10 +3,10 @@ package libpod
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
)
func GetInfo(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go
index ef0839d1f..69cf4fe7f 100644
--- a/pkg/api/handlers/libpod/manifests.go
+++ b/pkg/api/handlers/libpod/manifests.go
@@ -12,14 +12,14 @@ import (
"github.com/containers/image/v5/docker/reference"
"github.com/containers/image/v5/manifest"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/auth"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/errorhandling"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/auth"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/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 d140ec07f..aebf601b7 100644
--- a/pkg/api/handlers/libpod/networks.go
+++ b/pkg/api/handlers/libpod/networks.go
@@ -5,13 +5,13 @@ import (
"net/http"
"github.com/containers/common/libnetwork/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/libpod/play.go b/pkg/api/handlers/libpod/play.go
index 6ef83ad92..0c480dfbf 100644
--- a/pkg/api/handlers/libpod/play.go
+++ b/pkg/api/handlers/libpod/play.go
@@ -8,12 +8,12 @@ import (
"os"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/auth"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/auth"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
"github.com/gorilla/schema"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index 43b39060b..4b15c9675 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -7,17 +7,17 @@ import (
"strings"
"time"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/specgen"
- "github.com/containers/podman/v3/pkg/specgen/generate"
- "github.com/containers/podman/v3/pkg/specgenutil"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/specgen"
+ "github.com/containers/podman/v4/pkg/specgen/generate"
+ "github.com/containers/podman/v4/pkg/specgenutil"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/gorilla/schema"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/libpod/secrets.go b/pkg/api/handlers/libpod/secrets.go
index 5cdff8387..2523dc139 100644
--- a/pkg/api/handlers/libpod/secrets.go
+++ b/pkg/api/handlers/libpod/secrets.go
@@ -5,11 +5,11 @@ import (
"net/http"
"reflect"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/libpod/swagger.go b/pkg/api/handlers/libpod/swagger.go
index db93d7ac6..5f33e6c01 100644
--- a/pkg/api/handlers/libpod/swagger.go
+++ b/pkg/api/handlers/libpod/swagger.go
@@ -6,9 +6,9 @@ import (
"github.com/containers/common/libnetwork/types"
"github.com/containers/image/v5/manifest"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- "github.com/containers/podman/v3/pkg/domain/entities"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ "github.com/containers/podman/v4/pkg/domain/entities"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go
index b7c60736f..f06d4b8c5 100644
--- a/pkg/api/handlers/libpod/system.go
+++ b/pkg/api/handlers/libpod/system.go
@@ -3,12 +3,12 @@ package libpod
import (
"net/http"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go
index ffdb30551..29085c06f 100644
--- a/pkg/api/handlers/libpod/volumes.go
+++ b/pkg/api/handlers/libpod/volumes.go
@@ -5,16 +5,16 @@ import (
"net/http"
"net/url"
- "github.com/containers/podman/v3/libpod"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers/utils"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/entities/reports"
- "github.com/containers/podman/v3/pkg/domain/filters"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/domain/infra/abi/parse"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers/utils"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/entities/reports"
+ "github.com/containers/podman/v4/pkg/domain/filters"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi/parse"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/swagger/swagger.go b/pkg/api/handlers/swagger/swagger.go
index 7868ff206..7446d901e 100644
--- a/pkg/api/handlers/swagger/swagger.go
+++ b/pkg/api/handlers/swagger/swagger.go
@@ -1,10 +1,10 @@
package swagger
import (
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/api/handlers"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/inspect"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/inspect"
"github.com/docker/docker/api/types"
)
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
index d3a592bdf..07eebb4f4 100644
--- a/pkg/api/handlers/types.go
+++ b/pkg/api/handlers/types.go
@@ -5,7 +5,7 @@ import (
"time"
"github.com/containers/common/libimage"
- "github.com/containers/podman/v3/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/entities"
docker "github.com/docker/docker/api/types"
dockerContainer "github.com/docker/docker/api/types/container"
dockerNetwork "github.com/docker/docker/api/types/network"
diff --git a/pkg/api/handlers/types/types.go b/pkg/api/handlers/types/types.go
index e7920047e..71e1d5024 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/v3/pkg/domain/entities"
+import "github.com/containers/podman/v4/pkg/domain/entities"
// LibpodImagesRemoveReport is the return type for image removal via the rest
// api.
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index 6f875fc30..d1e1164a4 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -7,17 +7,17 @@ import (
"strconv"
"time"
- "github.com/containers/podman/v3/libpod/events"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/containers/podman/v3/pkg/domain/infra/abi"
+ "github.com/containers/podman/v4/libpod/events"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/domain/entities"
+ "github.com/containers/podman/v4/pkg/domain/infra/abi"
- "github.com/containers/podman/v3/pkg/api/handlers"
+ "github.com/containers/podman/v4/pkg/api/handlers"
"github.com/sirupsen/logrus"
- "github.com/containers/podman/v3/libpod/define"
+ "github.com/containers/podman/v4/libpod/define"
- "github.com/containers/podman/v3/libpod"
+ "github.com/containers/podman/v4/libpod"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go
index 4a8005bfd..1bce19c10 100644
--- a/pkg/api/handlers/utils/errors.go
+++ b/pkg/api/handlers/utils/errors.go
@@ -4,8 +4,8 @@ import (
"fmt"
"net/http"
- "github.com/containers/podman/v3/libpod/define"
- "github.com/containers/podman/v3/pkg/errorhandling"
+ "github.com/containers/podman/v4/libpod/define"
+ "github.com/containers/podman/v4/pkg/errorhandling"
"github.com/containers/storage"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go
index ee83755a1..a9b6f0659 100644
--- a/pkg/api/handlers/utils/handler.go
+++ b/pkg/api/handlers/utils/handler.go
@@ -10,7 +10,7 @@ import (
"unsafe"
"github.com/blang/semver"
- "github.com/containers/podman/v3/version"
+ "github.com/containers/podman/v4/version"
"github.com/gorilla/mux"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
diff --git a/pkg/api/handlers/utils/handler_test.go b/pkg/api/handlers/utils/handler_test.go
index 5957e7d74..924f5d246 100644
--- a/pkg/api/handlers/utils/handler_test.go
+++ b/pkg/api/handlers/utils/handler_test.go
@@ -7,7 +7,7 @@ import (
"net/http/httptest"
"testing"
- "github.com/containers/podman/v3/version"
+ "github.com/containers/podman/v4/version"
"github.com/gorilla/mux"
)
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go
index 639de9915..15b16bc43 100644
--- a/pkg/api/handlers/utils/images.go
+++ b/pkg/api/handlers/utils/images.go
@@ -10,9 +10,9 @@ import (
storageTransport "github.com/containers/image/v5/storage"
"github.com/containers/image/v5/transports/alltransports"
"github.com/containers/image/v5/types"
- "github.com/containers/podman/v3/libpod"
- api "github.com/containers/podman/v3/pkg/api/types"
- "github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v4/libpod"
+ api "github.com/containers/podman/v4/pkg/api/types"
+ "github.com/containers/podman/v4/pkg/util"
"github.com/containers/storage"
"github.com/docker/distribution/reference"
"github.com/pkg/errors"