summaryrefslogtreecommitdiff
path: root/pkg/api/server
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-07-06 15:38:20 +0200
committerValentin Rothberg <rothberg@redhat.com>2020-07-06 15:50:12 +0200
commit8489dc43458da43d12ae37bac63753811acf96d9 (patch)
treec2dce0ff4c9f1a00f2f78da106da510c84756866 /pkg/api/server
parent9bccb0f091a82656593a069891f143e78a8719e9 (diff)
downloadpodman-8489dc43458da43d12ae37bac63753811acf96d9.tar.gz
podman-8489dc43458da43d12ae37bac63753811acf96d9.tar.bz2
podman-8489dc43458da43d12ae37bac63753811acf96d9.zip
move go module to v2
With the advent of Podman 2.0.0 we crossed the magical barrier of go modules. While we were able to continue importing all packages inside of the project, the project could not be vendored anymore from the outside. Move the go module to new major version and change all imports to `github.com/containers/libpod/v2`. The renaming of the imports was done via `gomove` [1]. [1] https://github.com/KSubedi/gomove Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/api/server')
-rw-r--r--pkg/api/server/handler_api.go2
-rw-r--r--pkg/api/server/register_archive.go4
-rw-r--r--pkg/api/server/register_auth.go2
-rw-r--r--pkg/api/server/register_containers.go4
-rw-r--r--pkg/api/server/register_distribution.go2
-rw-r--r--pkg/api/server/register_events.go2
-rw-r--r--pkg/api/server/register_exec.go2
-rw-r--r--pkg/api/server/register_generate.go2
-rw-r--r--pkg/api/server/register_healthcheck.go2
-rw-r--r--pkg/api/server/register_images.go4
-rw-r--r--pkg/api/server/register_info.go4
-rw-r--r--pkg/api/server/register_manifest.go2
-rw-r--r--pkg/api/server/register_monitor.go2
-rw-r--r--pkg/api/server/register_networks.go4
-rw-r--r--pkg/api/server/register_ping.go2
-rw-r--r--pkg/api/server/register_play.go2
-rw-r--r--pkg/api/server/register_plugins.go2
-rw-r--r--pkg/api/server/register_pods.go2
-rw-r--r--pkg/api/server/register_swagger.go2
-rw-r--r--pkg/api/server/register_swarm.go2
-rw-r--r--pkg/api/server/register_system.go4
-rw-r--r--pkg/api/server/register_version.go2
-rw-r--r--pkg/api/server/register_volumes.go4
-rw-r--r--pkg/api/server/server.go4
-rw-r--r--pkg/api/server/swagger.go6
25 files changed, 35 insertions, 35 deletions
diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go
index dbdb7f17b..b0fd932ba 100644
--- a/pkg/api/server/handler_api.go
+++ b/pkg/api/server/handler_api.go
@@ -6,7 +6,7 @@ import (
"net/http"
"runtime"
- "github.com/containers/libpod/pkg/api/handlers/utils"
+ "github.com/containers/libpod/v2/pkg/api/handlers/utils"
log "github.com/sirupsen/logrus"
)
diff --git a/pkg/api/server/register_archive.go b/pkg/api/server/register_archive.go
index a1d5941bc..4aeb7462e 100644
--- a/pkg/api/server/register_archive.go
+++ b/pkg/api/server/register_archive.go
@@ -3,8 +3,8 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 33b707fa4..1bf23d2eb 100644
--- a/pkg/api/server/register_auth.go
+++ b/pkg/api/server/register_auth.go
@@ -1,7 +1,7 @@
package server
import (
- "github.com/containers/libpod/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 0d78e4cdb..18ff2f423 100644
--- a/pkg/api/server/register_containers.go
+++ b/pkg/api/server/register_containers.go
@@ -3,8 +3,8 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 89f69ea67..73ef2e85b 100644
--- a/pkg/api/server/register_distribution.go
+++ b/pkg/api/server/register_distribution.go
@@ -1,7 +1,7 @@
package server
import (
- "github.com/containers/libpod/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 2b85eb169..72aabe496 100644
--- a/pkg/api/server/register_events.go
+++ b/pkg/api/server/register_events.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 af9a83496..be6cbf9bc 100644
--- a/pkg/api/server/register_exec.go
+++ b/pkg/api/server/register_exec.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 391e60111..82f1dc680 100644
--- a/pkg/api/server/register_generate.go
+++ b/pkg/api/server/register_generate.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/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 69aa5bbfb..9059fdba7 100644
--- a/pkg/api/server/register_healthcheck.go
+++ b/pkg/api/server/register_healthcheck.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/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 754cb1b75..3c15c82d5 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -3,8 +3,8 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 75aaa957b..28e7e6e53 100644
--- a/pkg/api/server/register_info.go
+++ b/pkg/api/server/register_info.go
@@ -3,8 +3,8 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 8fd84f205..91e820dca 100644
--- a/pkg/api/server/register_manifest.go
+++ b/pkg/api/server/register_manifest.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/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 b7a7c3792..9a76ebac2 100644
--- a/pkg/api/server/register_monitor.go
+++ b/pkg/api/server/register_monitor.go
@@ -1,7 +1,7 @@
package server
import (
- "github.com/containers/libpod/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 3ea16f81a..3a45ee458 100644
--- a/pkg/api/server/register_networks.go
+++ b/pkg/api/server/register_networks.go
@@ -3,8 +3,8 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 bf7763029..70e88ee00 100644
--- a/pkg/api/server/register_ping.go
+++ b/pkg/api/server/register_ping.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/pkg/api/handlers/compat"
"github.com/gorilla/mux"
)
diff --git a/pkg/api/server/register_play.go b/pkg/api/server/register_play.go
index d04879c19..049be39de 100644
--- a/pkg/api/server/register_play.go
+++ b/pkg/api/server/register_play.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/pkg/api/handlers/libpod"
"github.com/gorilla/mux"
)
diff --git a/pkg/api/server/register_plugins.go b/pkg/api/server/register_plugins.go
index 5f6473fe8..c21564b5c 100644
--- a/pkg/api/server/register_plugins.go
+++ b/pkg/api/server/register_plugins.go
@@ -1,7 +1,7 @@
package server
import (
- "github.com/containers/libpod/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 4156dd86b..d5a286442 100644
--- a/pkg/api/server/register_pods.go
+++ b/pkg/api/server/register_pods.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/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 9048c1951..bf68fda3c 100644
--- a/pkg/api/server/register_swagger.go
+++ b/pkg/api/server/register_swagger.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/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 8a5588268..d1048bb8c 100644
--- a/pkg/api/server/register_swarm.go
+++ b/pkg/api/server/register_swarm.go
@@ -4,7 +4,7 @@ import (
"errors"
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/utils"
+ "github.com/containers/libpod/v2/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 118ad2d08..ef88cda09 100644
--- a/pkg/api/server/register_system.go
+++ b/pkg/api/server/register_system.go
@@ -3,8 +3,8 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 30289ffe3..38d27849c 100644
--- a/pkg/api/server/register_version.go
+++ b/pkg/api/server/register_version.go
@@ -3,7 +3,7 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/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 0f4f18b0a..72f0f4249 100644
--- a/pkg/api/server/register_volumes.go
+++ b/pkg/api/server/register_volumes.go
@@ -3,8 +3,8 @@ package server
import (
"net/http"
- "github.com/containers/libpod/pkg/api/handlers/compat"
- "github.com/containers/libpod/pkg/api/handlers/libpod"
+ "github.com/containers/libpod/v2/pkg/api/handlers/compat"
+ "github.com/containers/libpod/v2/pkg/api/handlers/libpod"
"github.com/gorilla/mux"
)
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 5b2f8bea2..8af6d3186 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -14,8 +14,8 @@ import (
"syscall"
"time"
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/pkg/api/handlers"
+ "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/libpod/v2/pkg/api/handlers"
"github.com/coreos/go-systemd/v22/activation"
"github.com/gorilla/mux"
"github.com/gorilla/schema"
diff --git a/pkg/api/server/swagger.go b/pkg/api/server/swagger.go
index c463f809e..26e8b22c2 100644
--- a/pkg/api/server/swagger.go
+++ b/pkg/api/server/swagger.go
@@ -1,9 +1,9 @@
package server
import (
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/libpod/define"
- "github.com/containers/libpod/pkg/domain/entities"
+ "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/libpod/v2/libpod/define"
+ "github.com/containers/libpod/v2/pkg/domain/entities"
)
// No such image