summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-10-14 19:53:55 +0200
committerGitHub <noreply@github.com>2021-10-14 19:53:55 +0200
commit77ae43af61819abc670854260e3bf265a9ad4662 (patch)
tree172b5ad9d9333b02fe337e668ccd1f8b146aeca8
parentac733032c19a711317edc889bd2cb6321ee3bbdf (diff)
parent50b9d82f2eaeff126cf0173b6215e15ff5223bcc (diff)
downloadpodman-77ae43af61819abc670854260e3bf265a9ad4662.tar.gz
podman-77ae43af61819abc670854260e3bf265a9ad4662.tar.bz2
podman-77ae43af61819abc670854260e3bf265a9ad4662.zip
Merge pull request #11971 from rhatdan/archive
Don't use docker/pkg/archive, use containers/storage/pkg/archive
-rw-r--r--cmd/podman/diff/diff.go2
-rw-r--r--libpod/container_copy_linux.go2
-rw-r--r--pkg/machine/pull.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/diff/diff.go b/cmd/podman/diff/diff.go
index 81bbb6c43..fba4ea540 100644
--- a/cmd/podman/diff/diff.go
+++ b/cmd/podman/diff/diff.go
@@ -8,7 +8,7 @@ import (
"github.com/containers/common/pkg/report"
"github.com/containers/podman/v3/cmd/podman/registry"
"github.com/containers/podman/v3/pkg/domain/entities"
- "github.com/docker/docker/pkg/archive"
+ "github.com/containers/storage/pkg/archive"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
diff --git a/libpod/container_copy_linux.go b/libpod/container_copy_linux.go
index 7d4dd0d46..954d54a1d 100644
--- a/libpod/container_copy_linux.go
+++ b/libpod/container_copy_linux.go
@@ -15,8 +15,8 @@ import (
"github.com/containers/buildah/util"
"github.com/containers/podman/v3/libpod/define"
"github.com/containers/podman/v3/pkg/rootless"
+ "github.com/containers/storage/pkg/archive"
"github.com/containers/storage/pkg/idtools"
- "github.com/docker/docker/pkg/archive"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/machine/pull.go b/pkg/machine/pull.go
index f79ac6ec4..3c8422a30 100644
--- a/pkg/machine/pull.go
+++ b/pkg/machine/pull.go
@@ -15,7 +15,7 @@ import (
"time"
"github.com/containers/image/v5/pkg/compression"
- "github.com/docker/docker/pkg/archive"
+ "github.com/containers/storage/pkg/archive"
"github.com/sirupsen/logrus"
"github.com/vbauerster/mpb/v6"
"github.com/vbauerster/mpb/v6/decor"