diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-10-14 10:24:02 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-10-19 15:56:35 -0400 |
| commit | b5dd62f31558caeb3c8cb4b83c0563db9f07cf20 (patch) | |
| tree | 15159457f9ce894a84f1263c31f04d3a0f67fc01 | |
| parent | a213661ae7af22038465c8a61d97bde211674996 (diff) | |
| download | podman-b5dd62f31558caeb3c8cb4b83c0563db9f07cf20.tar.gz podman-b5dd62f31558caeb3c8cb4b83c0563db9f07cf20.tar.bz2 podman-b5dd62f31558caeb3c8cb4b83c0563db9f07cf20.zip | |
Don't use docker/pkg/archive, use containers/storage/pkg/archive
[NO NEW TESTS NEEDED]
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -rw-r--r-- | cmd/podman/diff/diff.go | 2 | ||||
| -rw-r--r-- | libpod/container_copy_linux.go | 2 | ||||
| -rw-r--r-- | pkg/machine/pull.go | 2 |
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" |