Adds version to import package paths and use Go Modules (#178)

docker/client.go

@@ -31,10 +31,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/ory/dockertest/docker/opts"
-	"github.com/ory/dockertest/docker/pkg/homedir"
-	"github.com/ory/dockertest/docker/pkg/jsonmessage"
-	"github.com/ory/dockertest/docker/pkg/stdcopy"
+	"github.com/ory/dockertest/v3/docker/opts"
+	"github.com/ory/dockertest/v3/docker/pkg/homedir"
+	"github.com/ory/dockertest/v3/docker/pkg/jsonmessage"
+	"github.com/ory/dockertest/v3/docker/pkg/stdcopy"
 )
 
 const (

docker/distribution.go

@@ -7,7 +7,7 @@ package docker
 import (
 	"encoding/json"
 
-	"github.com/ory/dockertest/docker/types/registry"
+	"github.com/ory/dockertest/v3/docker/types/registry"
 )
 
 // InspectDistribution returns image digest and platform information by contacting the registry

docker/opts/runtime.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ory/dockertest/docker/types"
+	"github.com/ory/dockertest/v3/docker/types"
 )
 
 // RuntimeOpt defines a map of Runtimes

docker/pkg/archive/archive.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"archive/tar"
@@ -18,11 +18,11 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/ory/dockertest/docker/pkg/fileutils"
-	"github.com/ory/dockertest/docker/pkg/idtools"
-	"github.com/ory/dockertest/docker/pkg/ioutils"
-	"github.com/ory/dockertest/docker/pkg/pools"
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/fileutils"
+	"github.com/ory/dockertest/v3/docker/pkg/idtools"
+	"github.com/ory/dockertest/v3/docker/pkg/ioutils"
+	"github.com/ory/dockertest/v3/docker/pkg/pools"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 	"github.com/sirupsen/logrus"
 )
 

docker/pkg/archive/archive_linux.go

@@ -1,12 +1,12 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"archive/tar"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 	"golang.org/x/sys/unix"
 )
 

docker/pkg/archive/archive_other.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 func getWhiteoutConverter(format WhiteoutFormat) tarWhiteoutConverter {
 	return nil

docker/pkg/archive/archive_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"archive/tar"
@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/ory/dockertest/docker/pkg/idtools"
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/idtools"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 	"golang.org/x/sys/unix"
 )
 

docker/pkg/archive/archive_windows.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"archive/tar"
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/ory/dockertest/docker/pkg/idtools"
-	"github.com/ory/dockertest/docker/pkg/longpath"
+	"github.com/ory/dockertest/v3/docker/pkg/idtools"
+	"github.com/ory/dockertest/v3/docker/pkg/longpath"
 )
 
 // fixVolumePathPrefix does platform specific processing to ensure that if

docker/pkg/archive/changes.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"archive/tar"
@@ -13,9 +13,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/ory/dockertest/docker/pkg/idtools"
-	"github.com/ory/dockertest/docker/pkg/pools"
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/idtools"
+	"github.com/ory/dockertest/v3/docker/pkg/pools"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 	"github.com/sirupsen/logrus"
 )
 

docker/pkg/archive/changes_linux.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"bytes"
@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 	"golang.org/x/sys/unix"
 )
 

docker/pkg/archive/changes_other.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"fmt"
@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 )
 
 func collectFileInfoForChanges(oldDir, newDir string) (*FileInfo, *FileInfo, error) {

docker/pkg/archive/changes_unix.go

@@ -1,12 +1,12 @@
 // +build !windows
 
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"os"
 	"syscall"
 
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 	"golang.org/x/sys/unix"
 )
 

docker/pkg/archive/changes_windows.go

@@ -1,9 +1,9 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"os"
 
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 )
 
 func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {

docker/pkg/archive/copy.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"archive/tar"
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 	"github.com/sirupsen/logrus"
 )
 

docker/pkg/archive/copy_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"path/filepath"

docker/pkg/archive/copy_windows.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"path/filepath"

docker/pkg/archive/diff.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"archive/tar"
@@ -10,9 +10,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/ory/dockertest/docker/pkg/idtools"
-	"github.com/ory/dockertest/docker/pkg/pools"
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/idtools"
+	"github.com/ory/dockertest/v3/docker/pkg/pools"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 	"github.com/sirupsen/logrus"
 )
 

docker/pkg/archive/example_changes.go

@@ -13,7 +13,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/ory/dockertest/docker/pkg/archive"
+	"github.com/ory/dockertest/v3/docker/pkg/archive"
 	"github.com/sirupsen/logrus"
 )
 

docker/pkg/archive/time_linux.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"syscall"

docker/pkg/archive/time_unsupported.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"syscall"

docker/pkg/archive/whiteouts.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 // Whiteouts are files with a special meaning for the layered filesystem.
 // Docker uses AUFS whiteout files inside exported archives. In other

docker/pkg/archive/wrap.go

@@ -1,4 +1,4 @@
-package archive // import "github.com/ory/dockertest/docker/pkg/archive"
+package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
 
 import (
 	"archive/tar"

docker/pkg/fileutils/fileutils.go

@@ -1,4 +1,4 @@
-package fileutils // import "github.com/ory/dockertest/docker/pkg/fileutils"
+package fileutils // import "github.com/ory/dockertest/v3/docker/pkg/fileutils"
 
 import (
 	"errors"

docker/pkg/fileutils/fileutils_darwin.go

@@ -1,4 +1,4 @@
-package fileutils // import "github.com/ory/dockertest/docker/pkg/fileutils"
+package fileutils // import "github.com/ory/dockertest/v3/docker/pkg/fileutils"
 
 import (
 	"os"

docker/pkg/fileutils/fileutils_unix.go

@@ -1,6 +1,6 @@
 // +build linux freebsd
 
-package fileutils // import "github.com/ory/dockertest/docker/pkg/fileutils"
+package fileutils // import "github.com/ory/dockertest/v3/docker/pkg/fileutils"
 
 import (
 	"fmt"

docker/pkg/fileutils/fileutils_windows.go

@@ -1,4 +1,4 @@
-package fileutils // import "github.com/ory/dockertest/docker/pkg/fileutils"
+package fileutils // import "github.com/ory/dockertest/v3/docker/pkg/fileutils"
 
 // GetTotalUsedFds Returns the number of used File Descriptors. Not supported
 // on Windows.

docker/pkg/homedir/homedir_linux.go

@@ -1,9 +1,9 @@
-package homedir // import "github.com/ory/dockertest/docker/pkg/homedir"
+package homedir // import "github.com/ory/dockertest/v3/docker/pkg/homedir"
 
 import (
 	"os"
 
-	"github.com/ory/dockertest/docker/pkg/idtools"
+	"github.com/ory/dockertest/v3/docker/pkg/idtools"
 )
 
 // GetStatic returns the home directory for the current user without calling

docker/pkg/homedir/homedir_others.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package homedir // import "github.com/ory/dockertest/docker/pkg/homedir"
+package homedir // import "github.com/ory/dockertest/v3/docker/pkg/homedir"
 
 import (
 	"errors"

docker/pkg/homedir/homedir_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package homedir // import "github.com/ory/dockertest/docker/pkg/homedir"
+package homedir // import "github.com/ory/dockertest/v3/docker/pkg/homedir"
 
 import (
 	"os"

docker/pkg/homedir/homedir_windows.go

@@ -1,4 +1,4 @@
-package homedir // import "github.com/ory/dockertest/docker/pkg/homedir"
+package homedir // import "github.com/ory/dockertest/v3/docker/pkg/homedir"
 
 import (
 	"os"

docker/pkg/idtools/idtools.go

@@ -1,4 +1,4 @@
-package idtools // import "github.com/ory/dockertest/docker/pkg/idtools"
+package idtools // import "github.com/ory/dockertest/v3/docker/pkg/idtools"
 
 import (
 	"bufio"

docker/pkg/idtools/idtools_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package idtools // import "github.com/ory/dockertest/docker/pkg/idtools"
+package idtools // import "github.com/ory/dockertest/v3/docker/pkg/idtools"
 
 import (
 	"bytes"
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 	"github.com/opencontainers/runc/libcontainer/user"
 )
 

docker/pkg/idtools/idtools_windows.go

@@ -1,9 +1,9 @@
-package idtools // import "github.com/ory/dockertest/docker/pkg/idtools"
+package idtools // import "github.com/ory/dockertest/v3/docker/pkg/idtools"
 
 import (
 	"os"
 
-	"github.com/ory/dockertest/docker/pkg/system"
+	"github.com/ory/dockertest/v3/docker/pkg/system"
 )
 
 // Platforms such as Windows do not support the UID/GID concept. So make this

docker/pkg/idtools/usergroupadd_linux.go

@@ -1,4 +1,4 @@
-package idtools // import "github.com/ory/dockertest/docker/pkg/idtools"
+package idtools // import "github.com/ory/dockertest/v3/docker/pkg/idtools"
 
 import (
 	"fmt"

docker/pkg/idtools/usergroupadd_unsupported.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package idtools // import "github.com/ory/dockertest/docker/pkg/idtools"
+package idtools // import "github.com/ory/dockertest/v3/docker/pkg/idtools"
 
 import "fmt"
 

docker/pkg/idtools/utils_unix.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package idtools // import "github.com/ory/dockertest/docker/pkg/idtools"
+package idtools // import "github.com/ory/dockertest/v3/docker/pkg/idtools"
 
 import (
 	"fmt"

docker/pkg/ioutils/buffer.go

@@ -1,4 +1,4 @@
-package ioutils // import "github.com/ory/dockertest/docker/pkg/ioutils"
+package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils"
 
 import (
 	"errors"