diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-09 14:18:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 14:18:44 +0100 |
| commit | 6b3f447c8ec8ac385160234308d7fdeaf6b127e6 (patch) | |
| tree | 82e491af88967fd9f9acc69a1ca874f3c1839788 | |
| parent | f378e82e2d57ee60e5b0f973eb1ea2ee3a760428 (diff) | |
| parent | 7359075a7811d9fa226817c8d2e82da980694d88 (diff) | |
| download | podman-6b3f447c8ec8ac385160234308d7fdeaf6b127e6.tar.gz podman-6b3f447c8ec8ac385160234308d7fdeaf6b127e6.tar.bz2 podman-6b3f447c8ec8ac385160234308d7fdeaf6b127e6.zip | |
Merge pull request #5424 from vrothberg/home
use c/storage instead of docker/docker
| -rw-r--r-- | cmd/podman/remoteclientconfig/config_darwin.go | 2 | ||||
| -rw-r--r-- | cmd/podman/remoteclientconfig/config_linux.go | 2 | ||||
| -rw-r--r-- | cmd/podman/remoteclientconfig/config_windows.go | 2 | ||||
| -rw-r--r-- | pkg/resolvconf/resolvconf.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/remoteclientconfig/config_darwin.go b/cmd/podman/remoteclientconfig/config_darwin.go index b94941381..dddb217ac 100644 --- a/cmd/podman/remoteclientconfig/config_darwin.go +++ b/cmd/podman/remoteclientconfig/config_darwin.go @@ -3,7 +3,7 @@ package remoteclientconfig import ( "path/filepath" - "github.com/docker/docker/pkg/homedir" + "github.com/containers/storage/pkg/homedir" ) func getConfigFilePath() string { diff --git a/cmd/podman/remoteclientconfig/config_linux.go b/cmd/podman/remoteclientconfig/config_linux.go index 5d27f19f2..afcf73e6d 100644 --- a/cmd/podman/remoteclientconfig/config_linux.go +++ b/cmd/podman/remoteclientconfig/config_linux.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/docker/docker/pkg/homedir" + "github.com/containers/storage/pkg/homedir" ) func getConfigFilePath() string { diff --git a/cmd/podman/remoteclientconfig/config_windows.go b/cmd/podman/remoteclientconfig/config_windows.go index fa6ffca63..3a8f3bc7a 100644 --- a/cmd/podman/remoteclientconfig/config_windows.go +++ b/cmd/podman/remoteclientconfig/config_windows.go @@ -3,7 +3,7 @@ package remoteclientconfig import ( "path/filepath" - "github.com/docker/docker/pkg/homedir" + "github.com/containers/storage/pkg/homedir" ) func getConfigFilePath() string { diff --git a/pkg/resolvconf/resolvconf.go b/pkg/resolvconf/resolvconf.go index e85bcb377..20618e2dc 100644 --- a/pkg/resolvconf/resolvconf.go +++ b/pkg/resolvconf/resolvconf.go @@ -10,7 +10,7 @@ import ( "sync" "github.com/containers/libpod/pkg/resolvconf/dns" - "github.com/docker/docker/pkg/ioutils" + "github.com/containers/storage/pkg/ioutils" "github.com/sirupsen/logrus" ) |