From 2783450a92db2a6139aa61d9c927db1b99090642 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Fri, 15 Jul 2016 13:46:15 -0400 Subject: [PATCH] Rename: cow/cowman -> storage/oci-storage Rename the library module and CLI wrapper. Rename daemon/graphdriver to drivers. Catch up vendoring to match modules we've pruned. Signed-off-by: Nalin Dahyabhai --- archive/archive.go | 12 ++++++------ archive/archive_linux.go | 2 +- archive/archive_unix.go | 2 +- archive/archive_unix_test.go | 2 +- archive/archive_windows.go | 2 +- archive/changes.go | 6 +++--- archive/changes_linux.go | 2 +- archive/changes_other.go | 2 +- archive/changes_test.go | 2 +- archive/changes_unix.go | 2 +- archive/changes_windows.go | 2 +- archive/copy.go | 2 +- archive/diff.go | 6 +++--- archive/diff_test.go | 2 +- archive/example_changes.go | 2 +- chrootarchive/archive.go | 4 ++-- chrootarchive/archive_test.go | 6 +++--- chrootarchive/archive_unix.go | 4 ++-- chrootarchive/archive_windows.go | 4 ++-- chrootarchive/chroot_linux.go | 2 +- chrootarchive/diff.go | 2 +- chrootarchive/diff_unix.go | 6 +++--- chrootarchive/diff_windows.go | 4 ++-- chrootarchive/init_unix.go | 2 +- idtools/idtools_unix.go | 2 +- idtools/idtools_windows.go | 2 +- integration/utils.go | 2 +- ioutils/temp_windows.go | 2 +- jsonmessage/jsonmessage.go | 4 ++-- jsonmessage/jsonmessage_test.go | 4 ++-- mflag/example/example.go | 2 +- mflag/flag.go | 4 ++-- plugins/client.go | 2 +- plugins/client_test.go | 2 +- plugins/pluginrpc-gen/fixtures/foo.go | 2 +- pools/pools.go | 2 +- stringid/stringid.go | 2 +- stringutils/stringutils.go | 2 +- sysinfo/sysinfo.go | 2 +- 39 files changed, 59 insertions(+), 59 deletions(-) diff --git a/archive/archive.go b/archive/archive.go index ad3d65b..98197a0 100644 --- a/archive/archive.go +++ b/archive/archive.go @@ -18,12 +18,12 @@ import ( "syscall" "github.com/Sirupsen/logrus" - "github.com/docker/docker/pkg/fileutils" - "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/ioutils" - "github.com/docker/docker/pkg/pools" - "github.com/docker/docker/pkg/promise" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/fileutils" + "github.com/containers/storage/pkg/idtools" + "github.com/containers/storage/pkg/ioutils" + "github.com/containers/storage/pkg/pools" + "github.com/containers/storage/pkg/promise" + "github.com/containers/storage/pkg/system" ) type ( diff --git a/archive/archive_linux.go b/archive/archive_linux.go index 277ff98..f2a5f0b 100644 --- a/archive/archive_linux.go +++ b/archive/archive_linux.go @@ -7,7 +7,7 @@ import ( "strings" "syscall" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) func getWhiteoutConverter(format WhiteoutFormat) tarWhiteoutConverter { diff --git a/archive/archive_unix.go b/archive/archive_unix.go index fbc3bb8..19d731f 100644 --- a/archive/archive_unix.go +++ b/archive/archive_unix.go @@ -9,7 +9,7 @@ import ( "path/filepath" "syscall" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) // fixVolumePathPrefix does platform specific processing to ensure that if diff --git a/archive/archive_unix_test.go b/archive/archive_unix_test.go index 548391b..4bf0ae2 100644 --- a/archive/archive_unix_test.go +++ b/archive/archive_unix_test.go @@ -11,7 +11,7 @@ import ( "syscall" "testing" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) func TestCanonicalTarNameForPath(t *testing.T) { diff --git a/archive/archive_windows.go b/archive/archive_windows.go index 5c3a1be..828d3b9 100644 --- a/archive/archive_windows.go +++ b/archive/archive_windows.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/docker/docker/pkg/longpath" + "github.com/containers/storage/pkg/longpath" ) // fixVolumePathPrefix does platform specific processing to ensure that if diff --git a/archive/changes.go b/archive/changes.go index 4e2d8e5..234b0a6 100644 --- a/archive/changes.go +++ b/archive/changes.go @@ -14,9 +14,9 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/pools" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/idtools" + "github.com/containers/storage/pkg/pools" + "github.com/containers/storage/pkg/system" ) // ChangeType represents the change type. diff --git a/archive/changes_linux.go b/archive/changes_linux.go index a4cc0c6..798d7bf 100644 --- a/archive/changes_linux.go +++ b/archive/changes_linux.go @@ -9,7 +9,7 @@ import ( "syscall" "unsafe" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) // walker is used to implement collectFileInfoForChanges on linux. Where this diff --git a/archive/changes_other.go b/archive/changes_other.go index da70ed3..e1d1e7a 100644 --- a/archive/changes_other.go +++ b/archive/changes_other.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) func collectFileInfoForChanges(oldDir, newDir string) (*FileInfo, *FileInfo, error) { diff --git a/archive/changes_test.go b/archive/changes_test.go index 8a2d0e8..f19c9fd 100644 --- a/archive/changes_test.go +++ b/archive/changes_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) func max(x, y int) int { diff --git a/archive/changes_unix.go b/archive/changes_unix.go index 3778b73..43dd94e 100644 --- a/archive/changes_unix.go +++ b/archive/changes_unix.go @@ -6,7 +6,7 @@ import ( "os" "syscall" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool { diff --git a/archive/changes_windows.go b/archive/changes_windows.go index af94243..06eadd6 100644 --- a/archive/changes_windows.go +++ b/archive/changes_windows.go @@ -3,7 +3,7 @@ package archive import ( "os" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool { diff --git a/archive/copy.go b/archive/copy.go index e1fa73f..05c243d 100644 --- a/archive/copy.go +++ b/archive/copy.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/Sirupsen/logrus" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) // Errors used or returned by this file. diff --git a/archive/diff.go b/archive/diff.go index 1b08ad3..eba7173 100644 --- a/archive/diff.go +++ b/archive/diff.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/Sirupsen/logrus" - "github.com/docker/docker/pkg/idtools" - "github.com/docker/docker/pkg/pools" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/idtools" + "github.com/containers/storage/pkg/pools" + "github.com/containers/storage/pkg/system" ) // UnpackLayer unpack `layer` to a `dest`. The stream `layer` can be diff --git a/archive/diff_test.go b/archive/diff_test.go index 8167941..b6f654b 100644 --- a/archive/diff_test.go +++ b/archive/diff_test.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "github.com/docker/docker/pkg/ioutils" + "github.com/containers/storage/pkg/ioutils" ) func TestApplyLayerInvalidFilenames(t *testing.T) { diff --git a/archive/example_changes.go b/archive/example_changes.go index cedd46a..ef33944 100644 --- a/archive/example_changes.go +++ b/archive/example_changes.go @@ -14,7 +14,7 @@ import ( "path" "github.com/Sirupsen/logrus" - "github.com/docker/docker/pkg/archive" + "github.com/containers/storage/pkg/archive" ) var ( diff --git a/chrootarchive/archive.go b/chrootarchive/archive.go index a7814f5..649575c 100644 --- a/chrootarchive/archive.go +++ b/chrootarchive/archive.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/idtools" + "github.com/containers/storage/pkg/archive" + "github.com/containers/storage/pkg/idtools" ) var chrootArchiver = &archive.Archiver{Untar: Untar} diff --git a/chrootarchive/archive_test.go b/chrootarchive/archive_test.go index 5fbe208..4a9b011 100644 --- a/chrootarchive/archive_test.go +++ b/chrootarchive/archive_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/reexec" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/archive" + "github.com/containers/storage/pkg/reexec" + "github.com/containers/storage/pkg/system" ) func init() { diff --git a/chrootarchive/archive_unix.go b/chrootarchive/archive_unix.go index f2325ab..5b26a52 100644 --- a/chrootarchive/archive_unix.go +++ b/chrootarchive/archive_unix.go @@ -12,8 +12,8 @@ import ( "os" "runtime" - "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/reexec" + "github.com/containers/storage/pkg/archive" + "github.com/containers/storage/pkg/reexec" ) // untar is the entry-point for docker-untar on re-exec. This is not used on diff --git a/chrootarchive/archive_windows.go b/chrootarchive/archive_windows.go index 0a500ed..93fde42 100644 --- a/chrootarchive/archive_windows.go +++ b/chrootarchive/archive_windows.go @@ -3,8 +3,8 @@ package chrootarchive import ( "io" - "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/longpath" + "github.com/containers/storage/pkg/archive" + "github.com/containers/storage/pkg/longpath" ) // chroot is not supported by Windows diff --git a/chrootarchive/chroot_linux.go b/chrootarchive/chroot_linux.go index cefbef9..54b5ff4 100644 --- a/chrootarchive/chroot_linux.go +++ b/chrootarchive/chroot_linux.go @@ -7,7 +7,7 @@ import ( "path/filepath" "syscall" - "github.com/docker/docker/pkg/mount" + "github.com/containers/storage/pkg/mount" ) // chroot on linux uses pivot_root instead of chroot diff --git a/chrootarchive/diff.go b/chrootarchive/diff.go index 94131a6..377aeb9 100644 --- a/chrootarchive/diff.go +++ b/chrootarchive/diff.go @@ -1,6 +1,6 @@ package chrootarchive -import "github.com/docker/docker/pkg/archive" +import "github.com/containers/storage/pkg/archive" // ApplyLayer parses a diff in the standard layer format from `layer`, // and applies it to the directory `dest`. The stream `layer` can only be diff --git a/chrootarchive/diff_unix.go b/chrootarchive/diff_unix.go index a4adb74..23daa72 100644 --- a/chrootarchive/diff_unix.go +++ b/chrootarchive/diff_unix.go @@ -12,9 +12,9 @@ import ( "path/filepath" "runtime" - "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/reexec" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/archive" + "github.com/containers/storage/pkg/reexec" + "github.com/containers/storage/pkg/system" ) type applyLayerResponse struct { diff --git a/chrootarchive/diff_windows.go b/chrootarchive/diff_windows.go index 8e1830c..cfada9b 100644 --- a/chrootarchive/diff_windows.go +++ b/chrootarchive/diff_windows.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/docker/docker/pkg/archive" - "github.com/docker/docker/pkg/longpath" + "github.com/containers/storage/pkg/archive" + "github.com/containers/storage/pkg/longpath" ) // applyLayerHandler parses a diff in the standard layer format from `layer`, and diff --git a/chrootarchive/init_unix.go b/chrootarchive/init_unix.go index 4f637f1..7b8a46f 100644 --- a/chrootarchive/init_unix.go +++ b/chrootarchive/init_unix.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "os" - "github.com/docker/docker/pkg/reexec" + "github.com/containers/storage/pkg/reexec" ) func init() { diff --git a/idtools/idtools_unix.go b/idtools/idtools_unix.go index b57d6ef..b2cfb05 100644 --- a/idtools/idtools_unix.go +++ b/idtools/idtools_unix.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chownExisting bool) error { diff --git a/idtools/idtools_windows.go b/idtools/idtools_windows.go index c9e3c93..0cad173 100644 --- a/idtools/idtools_windows.go +++ b/idtools/idtools_windows.go @@ -5,7 +5,7 @@ package idtools import ( "os" - "github.com/docker/docker/pkg/system" + "github.com/containers/storage/pkg/system" ) // Platforms such as Windows do not support the UID/GID concept. So make this diff --git a/integration/utils.go b/integration/utils.go index cfccc80..806d611 100644 --- a/integration/utils.go +++ b/integration/utils.go @@ -15,7 +15,7 @@ import ( "syscall" "time" - "github.com/docker/docker/pkg/stringutils" + "github.com/containers/storage/pkg/stringutils" ) // GetExitCode returns the ExitStatus of the specified error if its type is diff --git a/ioutils/temp_windows.go b/ioutils/temp_windows.go index c258e5f..c719c12 100644 --- a/ioutils/temp_windows.go +++ b/ioutils/temp_windows.go @@ -5,7 +5,7 @@ package ioutils import ( "io/ioutil" - "github.com/docker/docker/pkg/longpath" + "github.com/containers/storage/pkg/longpath" ) // TempDir is the equivalent of ioutil.TempDir, except that the result is in Windows longpath format. diff --git a/jsonmessage/jsonmessage.go b/jsonmessage/jsonmessage.go index 91b073b..0287dd0 100644 --- a/jsonmessage/jsonmessage.go +++ b/jsonmessage/jsonmessage.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/docker/docker/pkg/jsonlog" - "github.com/docker/docker/pkg/term" + "github.com/containers/storage/pkg/jsonlog" + "github.com/containers/storage/pkg/term" "github.com/docker/go-units" ) diff --git a/jsonmessage/jsonmessage_test.go b/jsonmessage/jsonmessage_test.go index 479857d..1b9c50a 100644 --- a/jsonmessage/jsonmessage_test.go +++ b/jsonmessage/jsonmessage_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/docker/docker/pkg/jsonlog" - "github.com/docker/docker/pkg/term" + "github.com/containers/storage/pkg/jsonlog" + "github.com/containers/storage/pkg/term" ) func TestError(t *testing.T) { diff --git a/mflag/example/example.go b/mflag/example/example.go index 2e766dd..0911d09 100644 --- a/mflag/example/example.go +++ b/mflag/example/example.go @@ -3,7 +3,7 @@ package main import ( "fmt" - flag "github.com/docker/docker/pkg/mflag" + flag "github.com/containers/storage/pkg/mflag" ) var ( diff --git a/mflag/flag.go b/mflag/flag.go index 5014157..e4ce141 100644 --- a/mflag/flag.go +++ b/mflag/flag.go @@ -9,7 +9,7 @@ // Define flags using flag.String(), Bool(), Int(), etc. // // This declares an integer flag, -f or --flagname, stored in the pointer ip, with type *int. -// import "flag /github.com/docker/docker/pkg/mflag" +// import "flag /github.com/containers/storage/pkg/mflag" // var ip = flag.Int([]string{"f", "-flagname"}, 1234, "help message for flagname") // If you like, you can bind the flag to a variable using the Var() functions. // var flagvar int @@ -92,7 +92,7 @@ import ( "text/tabwriter" "time" - "github.com/docker/docker/pkg/homedir" + "github.com/containers/storage/pkg/homedir" ) // ErrHelp is the error returned if the flag -help is invoked but no such flag is defined. diff --git a/plugins/client.go b/plugins/client.go index a778677..a8865a0 100644 --- a/plugins/client.go +++ b/plugins/client.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/docker/docker/pkg/plugins/transport" + "github.com/containers/storage/pkg/plugins/transport" "github.com/docker/go-connections/sockets" "github.com/docker/go-connections/tlsconfig" ) diff --git a/plugins/client_test.go b/plugins/client_test.go index 9faad86..56b3d71 100644 --- a/plugins/client_test.go +++ b/plugins/client_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/docker/docker/pkg/plugins/transport" + "github.com/containers/storage/pkg/plugins/transport" "github.com/docker/go-connections/tlsconfig" ) diff --git a/plugins/pluginrpc-gen/fixtures/foo.go b/plugins/pluginrpc-gen/fixtures/foo.go index 5695dcc..642cefe 100644 --- a/plugins/pluginrpc-gen/fixtures/foo.go +++ b/plugins/pluginrpc-gen/fixtures/foo.go @@ -5,7 +5,7 @@ import ( aliasedio "io" - "github.com/docker/docker/pkg/plugins/pluginrpc-gen/fixtures/otherfixture" + "github.com/containers/storage/pkg/plugins/pluginrpc-gen/fixtures/otherfixture" ) var ( diff --git a/pools/pools.go b/pools/pools.go index 6f5988e..a15e368 100644 --- a/pools/pools.go +++ b/pools/pools.go @@ -14,7 +14,7 @@ import ( "io" "sync" - "github.com/docker/docker/pkg/ioutils" + "github.com/containers/storage/pkg/ioutils" ) var ( diff --git a/stringid/stringid.go b/stringid/stringid.go index 161184f..74dfaaa 100644 --- a/stringid/stringid.go +++ b/stringid/stringid.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/docker/docker/pkg/random" + "github.com/containers/storage/pkg/random" ) const shortLen = 12 diff --git a/stringutils/stringutils.go b/stringutils/stringutils.go index 7c00b97..078ceaf 100644 --- a/stringutils/stringutils.go +++ b/stringutils/stringutils.go @@ -6,7 +6,7 @@ import ( "math/rand" "strings" - "github.com/docker/docker/pkg/random" + "github.com/containers/storage/pkg/random" ) // GenerateRandomAlphaOnlyString generates an alphabetical random string with length n. diff --git a/sysinfo/sysinfo.go b/sysinfo/sysinfo.go index dc71dbf..dc6f9ea 100644 --- a/sysinfo/sysinfo.go +++ b/sysinfo/sysinfo.go @@ -1,6 +1,6 @@ package sysinfo -import "github.com/docker/docker/pkg/parsers" +import "github.com/containers/storage/pkg/parsers" // SysInfo stores information about which features a kernel supports. // TODO Windows: Factor out platform specific capabilities.