*: import paths and a README

This will make the packaages/components individually more consumable

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>

README.md

@@ -0,0 +1,11 @@
+pkg/ is a collection of utility packages started by the Docker project without being specific to its internals.
+
+Utility packages are kept separate from the docker core codebase to keep it as small and concise as possible.
+If some utilities grow larger and their APIs stabilize, they may be moved to their own repository under the
+Docker organization, to facilitate re-use by other projects. However that is not the priority.
+
+The `pkg` name is after the same directory in the camlistore project. Since Brad is a core
+Go maintainer, we thought it made sense to copy his methods for organizing Go code :) Thanks Brad!
+
+Because utility packages are small and neatly separated from the rest of the codebase, they are a good
+place to start for aspiring maintainers and contributors. Get in touch if you want to help maintain them!

archive/archive.go

@@ -18,12 +18,12 @@ import (
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
-	"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"
+	"github.com/containers/pkg/fileutils"
+	"github.com/containers/pkg/idtools"
+	"github.com/containers/pkg/ioutils"
+	"github.com/containers/pkg/pools"
+	"github.com/containers/pkg/promise"
+	"github.com/containers/pkg/system"
 )
 
 type (

archive/archive_linux.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 func getWhiteoutConverter(format WhiteoutFormat) tarWhiteoutConverter {

archive/archive_unix.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 // fixVolumePathPrefix does platform specific processing to ensure that if

archive/archive_unix_test.go

@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 func TestCanonicalTarNameForPath(t *testing.T) {

archive/archive_windows.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/storage/pkg/longpath"
+	"github.com/containers/pkg/longpath"
 )
 
 // fixVolumePathPrefix does platform specific processing to ensure that if

archive/changes.go

@@ -14,9 +14,9 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/containers/storage/pkg/idtools"
-	"github.com/containers/storage/pkg/pools"
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/idtools"
+	"github.com/containers/pkg/pools"
+	"github.com/containers/pkg/system"
 )
 
 // ChangeType represents the change type.

archive/changes_linux.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 // walker is used to implement collectFileInfoForChanges on linux. Where this

archive/changes_other.go

@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 func collectFileInfoForChanges(oldDir, newDir string) (*FileInfo, *FileInfo, error) {

archive/changes_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 func max(x, y int) int {

archive/changes_unix.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"syscall"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {

archive/changes_windows.go

@@ -3,7 +3,7 @@ package archive
 import (
 	"os"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {

archive/copy.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 // Errors used or returned by this file.

archive/diff.go

@@ -11,9 +11,9 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/containers/storage/pkg/idtools"
-	"github.com/containers/storage/pkg/pools"
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/idtools"
+	"github.com/containers/pkg/pools"
+	"github.com/containers/pkg/system"
 )
 
 // UnpackLayer unpack `layer` to a `dest`. The stream `layer` can be

archive/diff_test.go

@@ -10,7 +10,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/containers/storage/pkg/ioutils"
+	"github.com/containers/pkg/ioutils"
 )
 
 func TestApplyLayerInvalidFilenames(t *testing.T) {

archive/example_changes.go

@@ -14,7 +14,7 @@ import (
 	"path"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/containers/storage/pkg/archive"
+	"github.com/containers/pkg/archive"
 )
 
 var (

chrootarchive/archive.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/containers/storage/pkg/archive"
-	"github.com/containers/storage/pkg/idtools"
+	"github.com/containers/pkg/archive"
+	"github.com/containers/pkg/idtools"
 )
 
 var chrootArchiver = &archive.Archiver{Untar: Untar}

chrootarchive/archive_test.go

@@ -13,9 +13,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containers/storage/pkg/archive"
-	"github.com/containers/storage/pkg/reexec"
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/archive"
+	"github.com/containers/pkg/reexec"
+	"github.com/containers/pkg/system"
 )
 
 func init() {

chrootarchive/archive_unix.go

@@ -12,8 +12,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/containers/storage/pkg/archive"
-	"github.com/containers/storage/pkg/reexec"
+	"github.com/containers/pkg/archive"
+	"github.com/containers/pkg/reexec"
 )
 
 // untar is the entry-point for storage-untar on re-exec. This is not used on

chrootarchive/archive_windows.go

@@ -3,8 +3,8 @@ package chrootarchive
 import (
 	"io"
 
-	"github.com/containers/storage/pkg/archive"
-	"github.com/containers/storage/pkg/longpath"
+	"github.com/containers/pkg/archive"
+	"github.com/containers/pkg/longpath"
 )
 
 // chroot is not supported by Windows

chrootarchive/chroot_linux.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/containers/storage/pkg/mount"
+	"github.com/containers/pkg/mount"
 )
 
 // chroot on linux uses pivot_root instead of chroot

chrootarchive/diff.go

@@ -1,6 +1,6 @@
 package chrootarchive
 
-import "github.com/containers/storage/pkg/archive"
+import "github.com/containers/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

chrootarchive/diff_unix.go

@@ -12,9 +12,9 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/containers/storage/pkg/archive"
-	"github.com/containers/storage/pkg/reexec"
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/archive"
+	"github.com/containers/pkg/reexec"
+	"github.com/containers/pkg/system"
 )
 
 type applyLayerResponse struct {

chrootarchive/diff_windows.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/containers/storage/pkg/archive"
-	"github.com/containers/storage/pkg/longpath"
+	"github.com/containers/pkg/archive"
+	"github.com/containers/pkg/longpath"
 )
 
 // applyLayerHandler parses a diff in the standard layer format from `layer`, and

chrootarchive/init_unix.go

@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/containers/storage/pkg/reexec"
+	"github.com/containers/pkg/reexec"
 )
 
 func init() {

idtools/idtools_unix.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chownExisting bool) error {

idtools/idtools_windows.go

@@ -5,7 +5,7 @@ package idtools
 import (
 	"os"
 
-	"github.com/containers/storage/pkg/system"
+	"github.com/containers/pkg/system"
 )
 
 // Platforms such as Windows do not support the UID/GID concept. So make this

integration/utils.go

@@ -15,7 +15,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/storage/pkg/stringutils"
+	"github.com/containers/pkg/stringutils"
 )
 
 // GetExitCode returns the ExitStatus of the specified error if its type is

ioutils/temp_windows.go

@@ -5,7 +5,7 @@ package ioutils
 import (
 	"io/ioutil"
 
-	"github.com/containers/storage/pkg/longpath"
+	"github.com/containers/pkg/longpath"
 )
 
 // TempDir is the equivalent of ioutil.TempDir, except that the result is in Windows longpath format.

mflag/example/example.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	flag "github.com/containers/storage/pkg/mflag"
+	flag "github.com/containers/pkg/mflag"
 )
 
 var (

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/containers/storage/pkg/mflag"
+//		import "flag /github.com/containers/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/containers/storage/pkg/homedir"
+	"github.com/containers/pkg/homedir"
 )
 
 // ErrHelp is the error returned if the flag -help is invoked but no such flag is defined.

plugins/client.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/containers/storage/pkg/plugins/transport"
+	"github.com/containers/pkg/plugins/transport"
 	"github.com/docker/go-connections/sockets"
 	"github.com/docker/go-connections/tlsconfig"
 )

plugins/client_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containers/storage/pkg/plugins/transport"
+	"github.com/containers/pkg/plugins/transport"
 	"github.com/docker/go-connections/tlsconfig"
 )
 

plugins/pluginrpc-gen/fixtures/foo.go

@@ -5,7 +5,7 @@ import (
 
 	aliasedio "io"
 
-	"github.com/containers/storage/pkg/plugins/pluginrpc-gen/fixtures/otherfixture"
+	"github.com/containers/pkg/plugins/pluginrpc-gen/fixtures/otherfixture"
 )
 
 var (

pools/pools.go

@@ -14,7 +14,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/containers/storage/pkg/ioutils"
+	"github.com/containers/pkg/ioutils"
 )
 
 var (

stringid/stringid.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containers/storage/pkg/random"
+	"github.com/containers/pkg/random"
 )
 
 const shortLen = 12

stringutils/stringutils.go

@@ -6,7 +6,7 @@ import (
 	"math/rand"
 	"strings"
 
-	"github.com/containers/storage/pkg/random"
+	"github.com/containers/pkg/random"
 )
 
 // GenerateRandomAlphaOnlyString generates an alphabetical random string with length n.