Merge pull request containers#11971 from rhatdan/archive

Don't use docker/pkg/archive, use containers/storage/pkg/archive
rhatdan · Oct 14, 2021 · 77ae43a · 77ae43a
2 parents ac73303 + 50b9d82
commit 77ae43a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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"