diff --git a/docker/client.go b/docker/client.go index fdfe04f3..4a7e7021 100644 --- a/docker/client.go +++ b/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 ( diff --git a/docker/distribution.go b/docker/distribution.go index 0df12faa..a211b192 100644 --- a/docker/distribution.go +++ b/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 diff --git a/docker/opts/runtime.go b/docker/opts/runtime.go index 28f0e878..51374977 100644 --- a/docker/opts/runtime.go +++ b/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 diff --git a/docker/pkg/archive/archive.go b/docker/pkg/archive/archive.go index 5aba4878..0d3974d2 100644 --- a/docker/pkg/archive/archive.go +++ b/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" ) diff --git a/docker/pkg/archive/archive_linux.go b/docker/pkg/archive/archive_linux.go index 1827585b..8d584b49 100644 --- a/docker/pkg/archive/archive_linux.go +++ b/docker/pkg/archive/archive_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 ( "archive/tar" @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/ory/dockertest/docker/pkg/system" + "github.com/ory/dockertest/v3/docker/pkg/system" "golang.org/x/sys/unix" ) diff --git a/docker/pkg/archive/archive_other.go b/docker/pkg/archive/archive_other.go index 5a409069..5057a0a5 100644 --- a/docker/pkg/archive/archive_other.go +++ b/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 diff --git a/docker/pkg/archive/archive_unix.go b/docker/pkg/archive/archive_unix.go index 91e9b64b..ccd92103 100644 --- a/docker/pkg/archive/archive_unix.go +++ b/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" ) diff --git a/docker/pkg/archive/archive_windows.go b/docker/pkg/archive/archive_windows.go index d0f41fd5..5e3b34b3 100644 --- a/docker/pkg/archive/archive_windows.go +++ b/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 diff --git a/docker/pkg/archive/changes.go b/docker/pkg/archive/changes.go index 0e0a1a76..15abebc9 100644 --- a/docker/pkg/archive/changes.go +++ b/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" ) diff --git a/docker/pkg/archive/changes_linux.go b/docker/pkg/archive/changes_linux.go index 6c6ee1d2..73b90a4c 100644 --- a/docker/pkg/archive/changes_linux.go +++ b/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" ) diff --git a/docker/pkg/archive/changes_other.go b/docker/pkg/archive/changes_other.go index 58a7c5fa..e6ea91b5 100644 --- a/docker/pkg/archive/changes_other.go +++ b/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) { diff --git a/docker/pkg/archive/changes_unix.go b/docker/pkg/archive/changes_unix.go index a6496087..11552957 100644 --- a/docker/pkg/archive/changes_unix.go +++ b/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" ) diff --git a/docker/pkg/archive/changes_windows.go b/docker/pkg/archive/changes_windows.go index 497f2e14..a56c4c1e 100644 --- a/docker/pkg/archive/changes_windows.go +++ b/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 { diff --git a/docker/pkg/archive/copy.go b/docker/pkg/archive/copy.go index 8e072c5b..658b4513 100644 --- a/docker/pkg/archive/copy.go +++ b/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" ) diff --git a/docker/pkg/archive/copy_unix.go b/docker/pkg/archive/copy_unix.go index 4f5624ac..edb3b93c 100644 --- a/docker/pkg/archive/copy_unix.go +++ b/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" diff --git a/docker/pkg/archive/copy_windows.go b/docker/pkg/archive/copy_windows.go index 5564f098..2cc7ea18 100644 --- a/docker/pkg/archive/copy_windows.go +++ b/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" diff --git a/docker/pkg/archive/diff.go b/docker/pkg/archive/diff.go index cd310dfd..656c82ee 100644 --- a/docker/pkg/archive/diff.go +++ b/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" ) diff --git a/docker/pkg/archive/example_changes.go b/docker/pkg/archive/example_changes.go index d840f5a7..9149e5b8 100644 --- a/docker/pkg/archive/example_changes.go +++ b/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" ) diff --git a/docker/pkg/archive/time_linux.go b/docker/pkg/archive/time_linux.go index 93d75ee3..99f772bf 100644 --- a/docker/pkg/archive/time_linux.go +++ b/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" diff --git a/docker/pkg/archive/time_unsupported.go b/docker/pkg/archive/time_unsupported.go index 27b79ea8..58ff9219 100644 --- a/docker/pkg/archive/time_unsupported.go +++ b/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" diff --git a/docker/pkg/archive/whiteouts.go b/docker/pkg/archive/whiteouts.go index 694eba12..3c73d2c2 100644 --- a/docker/pkg/archive/whiteouts.go +++ b/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 diff --git a/docker/pkg/archive/wrap.go b/docker/pkg/archive/wrap.go index 2d80838d..72d24de6 100644 --- a/docker/pkg/archive/wrap.go +++ b/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" diff --git a/docker/pkg/fileutils/fileutils.go b/docker/pkg/fileutils/fileutils.go index 2ad86e8d..d8a631b3 100644 --- a/docker/pkg/fileutils/fileutils.go +++ b/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" diff --git a/docker/pkg/fileutils/fileutils_darwin.go b/docker/pkg/fileutils/fileutils_darwin.go index b1d9547f..1a57911c 100644 --- a/docker/pkg/fileutils/fileutils_darwin.go +++ b/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" diff --git a/docker/pkg/fileutils/fileutils_unix.go b/docker/pkg/fileutils/fileutils_unix.go index dba9a197..0b2ce977 100644 --- a/docker/pkg/fileutils/fileutils_unix.go +++ b/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" diff --git a/docker/pkg/fileutils/fileutils_windows.go b/docker/pkg/fileutils/fileutils_windows.go index 313fa619..0be14086 100644 --- a/docker/pkg/fileutils/fileutils_windows.go +++ b/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. diff --git a/docker/pkg/homedir/homedir_linux.go b/docker/pkg/homedir/homedir_linux.go index b3d1baf3..adb5f8be 100644 --- a/docker/pkg/homedir/homedir_linux.go +++ b/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 diff --git a/docker/pkg/homedir/homedir_others.go b/docker/pkg/homedir/homedir_others.go index a0bc93bf..fd38f920 100644 --- a/docker/pkg/homedir/homedir_others.go +++ b/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" diff --git a/docker/pkg/homedir/homedir_unix.go b/docker/pkg/homedir/homedir_unix.go index 65cfebcd..214c84a1 100644 --- a/docker/pkg/homedir/homedir_unix.go +++ b/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" diff --git a/docker/pkg/homedir/homedir_windows.go b/docker/pkg/homedir/homedir_windows.go index 0fda7d60..b1cd7c66 100644 --- a/docker/pkg/homedir/homedir_windows.go +++ b/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" diff --git a/docker/pkg/idtools/idtools.go b/docker/pkg/idtools/idtools.go index bf08340e..0aad59fd 100644 --- a/docker/pkg/idtools/idtools.go +++ b/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" diff --git a/docker/pkg/idtools/idtools_unix.go b/docker/pkg/idtools/idtools_unix.go index f0719952..a82f2e93 100644 --- a/docker/pkg/idtools/idtools_unix.go +++ b/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" ) diff --git a/docker/pkg/idtools/idtools_windows.go b/docker/pkg/idtools/idtools_windows.go index bc843fb3..96ecb1ce 100644 --- a/docker/pkg/idtools/idtools_windows.go +++ b/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 diff --git a/docker/pkg/idtools/usergroupadd_linux.go b/docker/pkg/idtools/usergroupadd_linux.go index bdd2d2b2..dc583d94 100644 --- a/docker/pkg/idtools/usergroupadd_linux.go +++ b/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" diff --git a/docker/pkg/idtools/usergroupadd_unsupported.go b/docker/pkg/idtools/usergroupadd_unsupported.go index 09b6923d..a9fd1681 100644 --- a/docker/pkg/idtools/usergroupadd_unsupported.go +++ b/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" diff --git a/docker/pkg/idtools/utils_unix.go b/docker/pkg/idtools/utils_unix.go index b17eef72..6eb0848b 100644 --- a/docker/pkg/idtools/utils_unix.go +++ b/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" diff --git a/docker/pkg/ioutils/buffer.go b/docker/pkg/ioutils/buffer.go index e9e9ace3..8ec65c71 100644 --- a/docker/pkg/ioutils/buffer.go +++ b/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" diff --git a/docker/pkg/ioutils/bytespipe.go b/docker/pkg/ioutils/bytespipe.go index 73d3032c..ec30e888 100644 --- a/docker/pkg/ioutils/bytespipe.go +++ b/docker/pkg/ioutils/bytespipe.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" diff --git a/docker/pkg/ioutils/fswriters.go b/docker/pkg/ioutils/fswriters.go index 09bee3c4..4c08d9dd 100644 --- a/docker/pkg/ioutils/fswriters.go +++ b/docker/pkg/ioutils/fswriters.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 ( "io" diff --git a/docker/pkg/ioutils/readers.go b/docker/pkg/ioutils/readers.go index 6eec9c80..eccf43b3 100644 --- a/docker/pkg/ioutils/readers.go +++ b/docker/pkg/ioutils/readers.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 ( "crypto/sha256" diff --git a/docker/pkg/ioutils/temp_unix.go b/docker/pkg/ioutils/temp_unix.go index 3faa457b..895f5db0 100644 --- a/docker/pkg/ioutils/temp_unix.go +++ b/docker/pkg/ioutils/temp_unix.go @@ -1,6 +1,6 @@ // +build !windows -package ioutils // import "github.com/ory/dockertest/docker/pkg/ioutils" +package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils" import "io/ioutil" diff --git a/docker/pkg/ioutils/temp_windows.go b/docker/pkg/ioutils/temp_windows.go index 9bc3bdb3..2c535d69 100644 --- a/docker/pkg/ioutils/temp_windows.go +++ b/docker/pkg/ioutils/temp_windows.go @@ -1,9 +1,9 @@ -package ioutils // import "github.com/ory/dockertest/docker/pkg/ioutils" +package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils" import ( "io/ioutil" - "github.com/ory/dockertest/docker/pkg/longpath" + "github.com/ory/dockertest/v3/docker/pkg/longpath" ) // TempDir is the equivalent of ioutil.TempDir, except that the result is in Windows longpath format. diff --git a/docker/pkg/ioutils/writeflusher.go b/docker/pkg/ioutils/writeflusher.go index 18322d18..997d0056 100644 --- a/docker/pkg/ioutils/writeflusher.go +++ b/docker/pkg/ioutils/writeflusher.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 ( "io" diff --git a/docker/pkg/ioutils/writers.go b/docker/pkg/ioutils/writers.go index 552d3ea0..6d63c90d 100644 --- a/docker/pkg/ioutils/writers.go +++ b/docker/pkg/ioutils/writers.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 "io" diff --git a/docker/pkg/jsonmessage/jsonmessage.go b/docker/pkg/jsonmessage/jsonmessage.go index 0a0f322c..c03014bc 100644 --- a/docker/pkg/jsonmessage/jsonmessage.go +++ b/docker/pkg/jsonmessage/jsonmessage.go @@ -1,4 +1,4 @@ -package jsonmessage // import "github.com/ory/dockertest/docker/pkg/jsonmessage" +package jsonmessage // import "github.com/ory/dockertest/v3/docker/pkg/jsonmessage" import ( "encoding/json" @@ -9,7 +9,7 @@ import ( "time" gotty "github.com/Nvveen/Gotty" - "github.com/ory/dockertest/docker/pkg/term" + "github.com/ory/dockertest/v3/docker/pkg/term" units "github.com/docker/go-units" ) diff --git a/docker/pkg/longpath/longpath.go b/docker/pkg/longpath/longpath.go index 83146ed6..d3d0a659 100644 --- a/docker/pkg/longpath/longpath.go +++ b/docker/pkg/longpath/longpath.go @@ -2,7 +2,7 @@ // in Windows, which are expected to be prepended with `\\?\` and followed by either // a drive letter, a UNC server\share, or a volume identifier. -package longpath // import "github.com/ory/dockertest/docker/pkg/longpath" +package longpath // import "github.com/ory/dockertest/v3/docker/pkg/longpath" import ( "strings" diff --git a/docker/pkg/mount/flags.go b/docker/pkg/mount/flags.go index 532493d6..24422096 100644 --- a/docker/pkg/mount/flags.go +++ b/docker/pkg/mount/flags.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" import ( "fmt" diff --git a/docker/pkg/mount/flags_freebsd.go b/docker/pkg/mount/flags_freebsd.go index 7ae0cd60..c9358265 100644 --- a/docker/pkg/mount/flags_freebsd.go +++ b/docker/pkg/mount/flags_freebsd.go @@ -1,6 +1,6 @@ // +build freebsd,cgo -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" /* #include diff --git a/docker/pkg/mount/flags_linux.go b/docker/pkg/mount/flags_linux.go index 49a0bd34..315346dd 100644 --- a/docker/pkg/mount/flags_linux.go +++ b/docker/pkg/mount/flags_linux.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" import ( "golang.org/x/sys/unix" diff --git a/docker/pkg/mount/flags_unsupported.go b/docker/pkg/mount/flags_unsupported.go index 53e5911f..fe03e2c5 100644 --- a/docker/pkg/mount/flags_unsupported.go +++ b/docker/pkg/mount/flags_unsupported.go @@ -1,6 +1,6 @@ // +build !linux,!freebsd freebsd,!cgo -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" // These flags are unsupported. const ( diff --git a/docker/pkg/mount/mount.go b/docker/pkg/mount/mount.go index 50fcf4dc..17ad6cf5 100644 --- a/docker/pkg/mount/mount.go +++ b/docker/pkg/mount/mount.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" import ( "sort" diff --git a/docker/pkg/mount/mounter_freebsd.go b/docker/pkg/mount/mounter_freebsd.go index a7d35135..4e2a5033 100644 --- a/docker/pkg/mount/mounter_freebsd.go +++ b/docker/pkg/mount/mounter_freebsd.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" /* #include diff --git a/docker/pkg/mount/mounter_linux.go b/docker/pkg/mount/mounter_linux.go index d72d7742..426eadb1 100644 --- a/docker/pkg/mount/mounter_linux.go +++ b/docker/pkg/mount/mounter_linux.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" import ( "golang.org/x/sys/unix" diff --git a/docker/pkg/mount/mounter_unsupported.go b/docker/pkg/mount/mounter_unsupported.go index 2194ccfc..8da9dc2a 100644 --- a/docker/pkg/mount/mounter_unsupported.go +++ b/docker/pkg/mount/mounter_unsupported.go @@ -1,6 +1,6 @@ // +build !linux,!freebsd freebsd,!cgo -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" func mount(device, target, mType string, flag uintptr, data string) error { panic("Not implemented") diff --git a/docker/pkg/mount/mountinfo.go b/docker/pkg/mount/mountinfo.go index e5a85590..1a3c3aa7 100644 --- a/docker/pkg/mount/mountinfo.go +++ b/docker/pkg/mount/mountinfo.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" // Info reveals information about a particular mounted filesystem. This // struct is populated from the content in the /proc//mountinfo file. diff --git a/docker/pkg/mount/mountinfo_freebsd.go b/docker/pkg/mount/mountinfo_freebsd.go index 3ebd5f62..44cfc3a1 100644 --- a/docker/pkg/mount/mountinfo_freebsd.go +++ b/docker/pkg/mount/mountinfo_freebsd.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" /* #include diff --git a/docker/pkg/mount/mountinfo_linux.go b/docker/pkg/mount/mountinfo_linux.go index cce80d33..5e3d725a 100644 --- a/docker/pkg/mount/mountinfo_linux.go +++ b/docker/pkg/mount/mountinfo_linux.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" import ( "bufio" diff --git a/docker/pkg/mount/mountinfo_unsupported.go b/docker/pkg/mount/mountinfo_unsupported.go index f683d43e..cea24bf9 100644 --- a/docker/pkg/mount/mountinfo_unsupported.go +++ b/docker/pkg/mount/mountinfo_unsupported.go @@ -1,6 +1,6 @@ // +build !windows,!linux,!freebsd freebsd,!cgo -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" import ( "fmt" diff --git a/docker/pkg/mount/mountinfo_windows.go b/docker/pkg/mount/mountinfo_windows.go index eed662c1..cc8506ca 100644 --- a/docker/pkg/mount/mountinfo_windows.go +++ b/docker/pkg/mount/mountinfo_windows.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" func parseMountTable() ([]*Info, error) { // Do NOT return an error! diff --git a/docker/pkg/mount/sharedsubtree_linux.go b/docker/pkg/mount/sharedsubtree_linux.go index 958d4a8d..2b337667 100644 --- a/docker/pkg/mount/sharedsubtree_linux.go +++ b/docker/pkg/mount/sharedsubtree_linux.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/pkg/mount" +package mount // import "github.com/ory/dockertest/v3/docker/pkg/mount" // MakeShared ensures a mounted filesystem has the SHARED mount option enabled. // See the supported options in flags.go for further reference. diff --git a/docker/pkg/pools/pools.go b/docker/pkg/pools/pools.go index 368e1684..ee72fbba 100644 --- a/docker/pkg/pools/pools.go +++ b/docker/pkg/pools/pools.go @@ -7,14 +7,14 @@ // // Utility functions which operate on pools should be added to this // package to allow them to be reused. -package pools // import "github.com/ory/dockertest/docker/pkg/pools" +package pools // import "github.com/ory/dockertest/v3/docker/pkg/pools" import ( "bufio" "io" "sync" - "github.com/ory/dockertest/docker/pkg/ioutils" + "github.com/ory/dockertest/v3/docker/pkg/ioutils" ) const buffer32K = 32 * 1024 diff --git a/docker/pkg/stdcopy/stdcopy.go b/docker/pkg/stdcopy/stdcopy.go index 03cf8057..f6e0916c 100644 --- a/docker/pkg/stdcopy/stdcopy.go +++ b/docker/pkg/stdcopy/stdcopy.go @@ -1,4 +1,4 @@ -package stdcopy // import "github.com/ory/dockertest/docker/pkg/stdcopy" +package stdcopy // import "github.com/ory/dockertest/v3/docker/pkg/stdcopy" import ( "bytes" diff --git a/docker/pkg/system/chtimes.go b/docker/pkg/system/chtimes.go index f2303f41..646aeccd 100644 --- a/docker/pkg/system/chtimes.go +++ b/docker/pkg/system/chtimes.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "os" diff --git a/docker/pkg/system/chtimes_unix.go b/docker/pkg/system/chtimes_unix.go index 904d81dd..fb711f38 100644 --- a/docker/pkg/system/chtimes_unix.go +++ b/docker/pkg/system/chtimes_unix.go @@ -1,6 +1,6 @@ // +build !windows -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "time" diff --git a/docker/pkg/system/chtimes_windows.go b/docker/pkg/system/chtimes_windows.go index c8ad0a1d..1366d158 100644 --- a/docker/pkg/system/chtimes_windows.go +++ b/docker/pkg/system/chtimes_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "time" diff --git a/docker/pkg/system/errors.go b/docker/pkg/system/errors.go index 6c795336..56d345ef 100644 --- a/docker/pkg/system/errors.go +++ b/docker/pkg/system/errors.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "errors" diff --git a/docker/pkg/system/exitcode.go b/docker/pkg/system/exitcode.go index d7ee535b..78297419 100644 --- a/docker/pkg/system/exitcode.go +++ b/docker/pkg/system/exitcode.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "fmt" diff --git a/docker/pkg/system/filesys.go b/docker/pkg/system/filesys.go index c92ac13c..50998526 100644 --- a/docker/pkg/system/filesys.go +++ b/docker/pkg/system/filesys.go @@ -1,6 +1,6 @@ // +build !windows -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "io/ioutil" diff --git a/docker/pkg/system/filesys_windows.go b/docker/pkg/system/filesys_windows.go index 58efa580..7c0af46b 100644 --- a/docker/pkg/system/filesys_windows.go +++ b/docker/pkg/system/filesys_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "os" diff --git a/docker/pkg/system/init.go b/docker/pkg/system/init.go index cae0bccf..aac11a52 100644 --- a/docker/pkg/system/init.go +++ b/docker/pkg/system/init.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "syscall" diff --git a/docker/pkg/system/init_unix.go b/docker/pkg/system/init_unix.go index 2cf9b9f2..542a7674 100644 --- a/docker/pkg/system/init_unix.go +++ b/docker/pkg/system/init_unix.go @@ -1,6 +1,6 @@ // +build !windows -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" // InitLCOW does nothing since LCOW is a windows only feature func InitLCOW(experimental bool) { diff --git a/docker/pkg/system/init_windows.go b/docker/pkg/system/init_windows.go index 6b360c57..78e97b82 100644 --- a/docker/pkg/system/init_windows.go +++ b/docker/pkg/system/init_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" // lcowSupported determines if Linux Containers on Windows are supported. var lcowSupported = false diff --git a/docker/pkg/system/lcow.go b/docker/pkg/system/lcow.go index 259fc3e5..31fb7437 100644 --- a/docker/pkg/system/lcow.go +++ b/docker/pkg/system/lcow.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "fmt" diff --git a/docker/pkg/system/lcow_unix.go b/docker/pkg/system/lcow_unix.go index fb01221e..e3e8248d 100644 --- a/docker/pkg/system/lcow_unix.go +++ b/docker/pkg/system/lcow_unix.go @@ -1,6 +1,6 @@ // +build !windows -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" // LCOWSupported returns true if Linux containers on Windows are supported. func LCOWSupported() bool { diff --git a/docker/pkg/system/lcow_windows.go b/docker/pkg/system/lcow_windows.go index 3652ccbc..b6bbfde4 100644 --- a/docker/pkg/system/lcow_windows.go +++ b/docker/pkg/system/lcow_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" // LCOWSupported returns true if Linux containers on Windows are supported. func LCOWSupported() bool { diff --git a/docker/pkg/system/lstat_unix.go b/docker/pkg/system/lstat_unix.go index b3714c0e..70fefd34 100644 --- a/docker/pkg/system/lstat_unix.go +++ b/docker/pkg/system/lstat_unix.go @@ -1,6 +1,6 @@ // +build !windows -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "syscall" diff --git a/docker/pkg/system/lstat_windows.go b/docker/pkg/system/lstat_windows.go index 399736d1..fe72ba13 100644 --- a/docker/pkg/system/lstat_windows.go +++ b/docker/pkg/system/lstat_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "os" diff --git a/docker/pkg/system/meminfo.go b/docker/pkg/system/meminfo.go index 54dd354e..ad2f4fb1 100644 --- a/docker/pkg/system/meminfo.go +++ b/docker/pkg/system/meminfo.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" // MemInfo contains memory statistics of the host system. type MemInfo struct { diff --git a/docker/pkg/system/meminfo_linux.go b/docker/pkg/system/meminfo_linux.go index ec3cd39b..3ebd773a 100644 --- a/docker/pkg/system/meminfo_linux.go +++ b/docker/pkg/system/meminfo_linux.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "bufio" diff --git a/docker/pkg/system/meminfo_unsupported.go b/docker/pkg/system/meminfo_unsupported.go index b1c15988..f140577d 100644 --- a/docker/pkg/system/meminfo_unsupported.go +++ b/docker/pkg/system/meminfo_unsupported.go @@ -1,6 +1,6 @@ // +build !linux,!windows -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" // ReadMemInfo is not supported on platforms other than linux and windows. func ReadMemInfo() (*MemInfo, error) { diff --git a/docker/pkg/system/meminfo_windows.go b/docker/pkg/system/meminfo_windows.go index 892c7397..849875f9 100644 --- a/docker/pkg/system/meminfo_windows.go +++ b/docker/pkg/system/meminfo_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "unsafe" diff --git a/docker/pkg/system/mknod.go b/docker/pkg/system/mknod.go index 157d86a6..cc020a0d 100644 --- a/docker/pkg/system/mknod.go +++ b/docker/pkg/system/mknod.go @@ -1,6 +1,6 @@ // +build !windows -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "golang.org/x/sys/unix" diff --git a/docker/pkg/system/mknod_windows.go b/docker/pkg/system/mknod_windows.go index 00674d11..0a694970 100644 --- a/docker/pkg/system/mknod_windows.go +++ b/docker/pkg/system/mknod_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" // Mknod is not implemented on Windows. func Mknod(path string, mode uint32, dev int) error { diff --git a/docker/pkg/system/path.go b/docker/pkg/system/path.go index 7c7c0d9a..4a4c53d1 100644 --- a/docker/pkg/system/path.go +++ b/docker/pkg/system/path.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "fmt" diff --git a/docker/pkg/system/process_unix.go b/docker/pkg/system/process_unix.go index 712c2067..7bbbe320 100644 --- a/docker/pkg/system/process_unix.go +++ b/docker/pkg/system/process_unix.go @@ -1,6 +1,6 @@ // +build linux freebsd darwin -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "syscall" diff --git a/docker/pkg/system/process_windows.go b/docker/pkg/system/process_windows.go index ba91fa9b..84054848 100644 --- a/docker/pkg/system/process_windows.go +++ b/docker/pkg/system/process_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "os" diff --git a/docker/pkg/system/rm.go b/docker/pkg/system/rm.go index 6a434941..36841b6e 100644 --- a/docker/pkg/system/rm.go +++ b/docker/pkg/system/rm.go @@ -1,11 +1,11 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "os" "syscall" "time" - "github.com/ory/dockertest/docker/pkg/mount" + "github.com/ory/dockertest/v3/docker/pkg/mount" "github.com/pkg/errors" ) diff --git a/docker/pkg/system/stat_darwin.go b/docker/pkg/system/stat_darwin.go index 873e3641..9c1c3bec 100644 --- a/docker/pkg/system/stat_darwin.go +++ b/docker/pkg/system/stat_darwin.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "syscall" diff --git a/docker/pkg/system/stat_freebsd.go b/docker/pkg/system/stat_freebsd.go index 873e3641..9c1c3bec 100644 --- a/docker/pkg/system/stat_freebsd.go +++ b/docker/pkg/system/stat_freebsd.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "syscall" diff --git a/docker/pkg/system/stat_linux.go b/docker/pkg/system/stat_linux.go index 2db4ede9..0fffa55e 100644 --- a/docker/pkg/system/stat_linux.go +++ b/docker/pkg/system/stat_linux.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "syscall" diff --git a/docker/pkg/system/stat_openbsd.go b/docker/pkg/system/stat_openbsd.go index f2a52fa4..3909fe55 100644 --- a/docker/pkg/system/stat_openbsd.go +++ b/docker/pkg/system/stat_openbsd.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "syscall" diff --git a/docker/pkg/system/stat_solaris.go b/docker/pkg/system/stat_solaris.go index f2a52fa4..3909fe55 100644 --- a/docker/pkg/system/stat_solaris.go +++ b/docker/pkg/system/stat_solaris.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "syscall" diff --git a/docker/pkg/system/stat_unix.go b/docker/pkg/system/stat_unix.go index 5e889c1b..b835b55c 100644 --- a/docker/pkg/system/stat_unix.go +++ b/docker/pkg/system/stat_unix.go @@ -1,6 +1,6 @@ // +build !windows -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "syscall" diff --git a/docker/pkg/system/stat_windows.go b/docker/pkg/system/stat_windows.go index 0c7636ba..159fe493 100644 --- a/docker/pkg/system/stat_windows.go +++ b/docker/pkg/system/stat_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "os" diff --git a/docker/pkg/system/syscall_unix.go b/docker/pkg/system/syscall_unix.go index fb56c884..e9734d97 100644 --- a/docker/pkg/system/syscall_unix.go +++ b/docker/pkg/system/syscall_unix.go @@ -1,6 +1,6 @@ // +build linux freebsd -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "golang.org/x/sys/unix" diff --git a/docker/pkg/system/syscall_windows.go b/docker/pkg/system/syscall_windows.go index 745e5ed5..cd15ef98 100644 --- a/docker/pkg/system/syscall_windows.go +++ b/docker/pkg/system/syscall_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "fmt" diff --git a/docker/pkg/system/umask.go b/docker/pkg/system/umask.go index 213bfc9b..0c0c183f 100644 --- a/docker/pkg/system/umask.go +++ b/docker/pkg/system/umask.go @@ -1,6 +1,6 @@ // +build !windows -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "golang.org/x/sys/unix" diff --git a/docker/pkg/system/umask_windows.go b/docker/pkg/system/umask_windows.go index 9bd689b7..001af707 100644 --- a/docker/pkg/system/umask_windows.go +++ b/docker/pkg/system/umask_windows.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" // Umask is not supported on the windows platform. func Umask(newmask int) (oldmask int, err error) { diff --git a/docker/pkg/system/utimes_freebsd.go b/docker/pkg/system/utimes_freebsd.go index 89514370..bffe852b 100644 --- a/docker/pkg/system/utimes_freebsd.go +++ b/docker/pkg/system/utimes_freebsd.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "syscall" diff --git a/docker/pkg/system/utimes_linux.go b/docker/pkg/system/utimes_linux.go index 8b48addc..841b9c88 100644 --- a/docker/pkg/system/utimes_linux.go +++ b/docker/pkg/system/utimes_linux.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import ( "syscall" diff --git a/docker/pkg/system/utimes_unsupported.go b/docker/pkg/system/utimes_unsupported.go index 15f8531c..3b68e06a 100644 --- a/docker/pkg/system/utimes_unsupported.go +++ b/docker/pkg/system/utimes_unsupported.go @@ -1,6 +1,6 @@ // +build !linux,!freebsd -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "syscall" diff --git a/docker/pkg/system/xattrs_linux.go b/docker/pkg/system/xattrs_linux.go index 7c1d8427..1fa01f44 100644 --- a/docker/pkg/system/xattrs_linux.go +++ b/docker/pkg/system/xattrs_linux.go @@ -1,4 +1,4 @@ -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" import "golang.org/x/sys/unix" diff --git a/docker/pkg/system/xattrs_unsupported.go b/docker/pkg/system/xattrs_unsupported.go index 6e24c0fd..2f949c01 100644 --- a/docker/pkg/system/xattrs_unsupported.go +++ b/docker/pkg/system/xattrs_unsupported.go @@ -1,6 +1,6 @@ // +build !linux -package system // import "github.com/ory/dockertest/docker/pkg/system" +package system // import "github.com/ory/dockertest/v3/docker/pkg/system" // Lgetxattr is not supported on platforms other than linux. func Lgetxattr(path string, attr string) ([]byte, error) { diff --git a/docker/pkg/term/ascii.go b/docker/pkg/term/ascii.go index 71775940..aedd93e6 100644 --- a/docker/pkg/term/ascii.go +++ b/docker/pkg/term/ascii.go @@ -1,4 +1,4 @@ -package term // import "github.com/ory/dockertest/docker/pkg/term" +package term // import "github.com/ory/dockertest/v3/docker/pkg/term" import ( "fmt" diff --git a/docker/pkg/term/proxy.go b/docker/pkg/term/proxy.go index 9e8ac170..46978144 100644 --- a/docker/pkg/term/proxy.go +++ b/docker/pkg/term/proxy.go @@ -1,4 +1,4 @@ -package term // import "github.com/ory/dockertest/docker/pkg/term" +package term // import "github.com/ory/dockertest/v3/docker/pkg/term" import ( "io" diff --git a/docker/pkg/term/tc.go b/docker/pkg/term/tc.go index f729a883..e3205380 100644 --- a/docker/pkg/term/tc.go +++ b/docker/pkg/term/tc.go @@ -1,6 +1,6 @@ // +build !windows -package term // import "github.com/ory/dockertest/docker/pkg/term" +package term // import "github.com/ory/dockertest/v3/docker/pkg/term" import ( "syscall" diff --git a/docker/pkg/term/term.go b/docker/pkg/term/term.go index 6895f1bf..65db9db5 100644 --- a/docker/pkg/term/term.go +++ b/docker/pkg/term/term.go @@ -2,7 +2,7 @@ // Package term provides structures and helper functions to work with // terminal (state, sizes). -package term // import "github.com/ory/dockertest/docker/pkg/term" +package term // import "github.com/ory/dockertest/v3/docker/pkg/term" import ( "errors" diff --git a/docker/pkg/term/term_windows.go b/docker/pkg/term/term_windows.go index 41031706..8be1a64e 100644 --- a/docker/pkg/term/term_windows.go +++ b/docker/pkg/term/term_windows.go @@ -1,4 +1,4 @@ -package term // import "github.com/ory/dockertest/docker/pkg/term" +package term // import "github.com/ory/dockertest/v3/docker/pkg/term" import ( "io" @@ -7,7 +7,7 @@ import ( "syscall" // used for STD_INPUT_HANDLE, STD_OUTPUT_HANDLE and STD_ERROR_HANDLE "github.com/Azure/go-ansiterm/winterm" - "github.com/ory/dockertest/docker/pkg/term/windows" + "github.com/ory/dockertest/v3/docker/pkg/term/windows" ) // State holds the console mode for the terminal. diff --git a/docker/pkg/term/termios_bsd.go b/docker/pkg/term/termios_bsd.go index 41522ac5..e1ca09dd 100644 --- a/docker/pkg/term/termios_bsd.go +++ b/docker/pkg/term/termios_bsd.go @@ -1,6 +1,6 @@ // +build darwin freebsd openbsd -package term // import "github.com/ory/dockertest/docker/pkg/term" +package term // import "github.com/ory/dockertest/v3/docker/pkg/term" import ( "unsafe" diff --git a/docker/pkg/term/termios_linux.go b/docker/pkg/term/termios_linux.go index 00313573..ffa7a682 100644 --- a/docker/pkg/term/termios_linux.go +++ b/docker/pkg/term/termios_linux.go @@ -1,4 +1,4 @@ -package term // import "github.com/ory/dockertest/docker/pkg/term" +package term // import "github.com/ory/dockertest/v3/docker/pkg/term" import ( "golang.org/x/sys/unix" diff --git a/docker/pkg/term/windows/ansi_reader.go b/docker/pkg/term/windows/ansi_reader.go index 6a90f37e..24cb8d83 100644 --- a/docker/pkg/term/windows/ansi_reader.go +++ b/docker/pkg/term/windows/ansi_reader.go @@ -1,6 +1,6 @@ // +build windows -package windowsconsole // import "github.com/ory/dockertest/docker/pkg/term/windows" +package windowsconsole // import "github.com/ory/dockertest/v3/docker/pkg/term/windows" import ( "bytes" diff --git a/docker/pkg/term/windows/ansi_writer.go b/docker/pkg/term/windows/ansi_writer.go index 6bf88c9d..c12a7e5c 100644 --- a/docker/pkg/term/windows/ansi_writer.go +++ b/docker/pkg/term/windows/ansi_writer.go @@ -1,6 +1,6 @@ // +build windows -package windowsconsole // import "github.com/ory/dockertest/docker/pkg/term/windows" +package windowsconsole // import "github.com/ory/dockertest/v3/docker/pkg/term/windows" import ( "io" diff --git a/docker/pkg/term/windows/console.go b/docker/pkg/term/windows/console.go index f2396aa0..d9fea499 100644 --- a/docker/pkg/term/windows/console.go +++ b/docker/pkg/term/windows/console.go @@ -1,6 +1,6 @@ // +build windows -package windowsconsole // import "github.com/ory/dockertest/docker/pkg/term/windows" +package windowsconsole // import "github.com/ory/dockertest/v3/docker/pkg/term/windows" import ( "os" diff --git a/docker/pkg/term/windows/windows.go b/docker/pkg/term/windows/windows.go index 20082b7c..8fce0ba8 100644 --- a/docker/pkg/term/windows/windows.go +++ b/docker/pkg/term/windows/windows.go @@ -2,7 +2,7 @@ // When asked for the set of standard streams (e.g., stdin, stdout, stderr), the code will create // and return pseudo-streams that convert ANSI sequences to / from Windows Console API calls. -package windowsconsole // import "github.com/ory/dockertest/docker/pkg/term/windows" +package windowsconsole // import "github.com/ory/dockertest/v3/docker/pkg/term/windows" import ( "io/ioutil" diff --git a/docker/pkg/term/winsize.go b/docker/pkg/term/winsize.go index fc05d960..fb8ea7f5 100644 --- a/docker/pkg/term/winsize.go +++ b/docker/pkg/term/winsize.go @@ -1,6 +1,6 @@ // +build !windows -package term // import "github.com/ory/dockertest/docker/pkg/term" +package term // import "github.com/ory/dockertest/v3/docker/pkg/term" import ( "golang.org/x/sys/unix" diff --git a/docker/tar.go b/docker/tar.go index 53d03dab..cbb24cdd 100644 --- a/docker/tar.go +++ b/docker/tar.go @@ -13,8 +13,8 @@ import ( "path/filepath" "strings" - "github.com/ory/dockertest/docker/pkg/archive" - "github.com/ory/dockertest/docker/pkg/fileutils" + "github.com/ory/dockertest/v3/docker/pkg/archive" + "github.com/ory/dockertest/v3/docker/pkg/fileutils" ) func createTarStream(srcPath, dockerfilePath string) (io.ReadCloser, error) { diff --git a/docker/types/auth.go b/docker/types/auth.go index 5429d0ac..bd3ed27d 100644 --- a/docker/types/auth.go +++ b/docker/types/auth.go @@ -1,4 +1,4 @@ -package types // import "github.com/ory/dockertest/docker/types" +package types // import "github.com/ory/dockertest/v3/docker/types" // AuthConfig contains authorization information for connecting to a Registry type AuthConfig struct { diff --git a/docker/types/blkiodev/blkio.go b/docker/types/blkiodev/blkio.go index 97945760..0702b835 100644 --- a/docker/types/blkiodev/blkio.go +++ b/docker/types/blkiodev/blkio.go @@ -1,4 +1,4 @@ -package blkiodev // import "github.com/ory/dockertest/docker/types/blkiodev" +package blkiodev // import "github.com/ory/dockertest/v3/docker/types/blkiodev" import "fmt" diff --git a/docker/types/client.go b/docker/types/client.go index 94dbd274..6a44b4f3 100644 --- a/docker/types/client.go +++ b/docker/types/client.go @@ -1,12 +1,12 @@ -package types // import "github.com/ory/dockertest/docker/types" +package types // import "github.com/ory/dockertest/v3/docker/types" import ( "bufio" "io" "net" - "github.com/ory/dockertest/docker/types/container" - "github.com/ory/dockertest/docker/types/filters" + "github.com/ory/dockertest/v3/docker/types/container" + "github.com/ory/dockertest/v3/docker/types/filters" units "github.com/docker/go-units" ) diff --git a/docker/types/configs.go b/docker/types/configs.go index e98d5d14..f125c8bd 100644 --- a/docker/types/configs.go +++ b/docker/types/configs.go @@ -1,8 +1,8 @@ -package types // import "github.com/ory/dockertest/docker/types" +package types // import "github.com/ory/dockertest/v3/docker/types" import ( - "github.com/ory/dockertest/docker/types/container" - "github.com/ory/dockertest/docker/types/network" + "github.com/ory/dockertest/v3/docker/types/container" + "github.com/ory/dockertest/v3/docker/types/network" ) // configs holds structs used for internal communication between the diff --git a/docker/types/container/config.go b/docker/types/container/config.go index 15300002..e72510a8 100644 --- a/docker/types/container/config.go +++ b/docker/types/container/config.go @@ -1,9 +1,9 @@ -package container // import "github.com/ory/dockertest/docker/types/container" +package container // import "github.com/ory/dockertest/v3/docker/types/container" import ( "time" - "github.com/ory/dockertest/docker/types/strslice" + "github.com/ory/dockertest/v3/docker/types/strslice" "github.com/docker/go-connections/nat" ) diff --git a/docker/types/container/host_config.go b/docker/types/container/host_config.go index f26dde4d..84dbc3b9 100644 --- a/docker/types/container/host_config.go +++ b/docker/types/container/host_config.go @@ -1,11 +1,11 @@ -package container // import "github.com/ory/dockertest/docker/types/container" +package container // import "github.com/ory/dockertest/v3/docker/types/container" import ( "strings" - "github.com/ory/dockertest/docker/types/blkiodev" - "github.com/ory/dockertest/docker/types/mount" - "github.com/ory/dockertest/docker/types/strslice" + "github.com/ory/dockertest/v3/docker/types/blkiodev" + "github.com/ory/dockertest/v3/docker/types/mount" + "github.com/ory/dockertest/v3/docker/types/strslice" "github.com/docker/go-connections/nat" "github.com/docker/go-units" ) diff --git a/docker/types/container/hostconfig_unix.go b/docker/types/container/hostconfig_unix.go index bb4590f8..22864689 100644 --- a/docker/types/container/hostconfig_unix.go +++ b/docker/types/container/hostconfig_unix.go @@ -1,6 +1,6 @@ // +build !windows -package container // import "github.com/ory/dockertest/docker/types/container" +package container // import "github.com/ory/dockertest/v3/docker/types/container" // IsValid indicates if an isolation technology is valid func (i Isolation) IsValid() bool { diff --git a/docker/types/container/hostconfig_windows.go b/docker/types/container/hostconfig_windows.go index 41c690b3..1aa7732b 100644 --- a/docker/types/container/hostconfig_windows.go +++ b/docker/types/container/hostconfig_windows.go @@ -1,4 +1,4 @@ -package container // import "github.com/ory/dockertest/docker/types/container" +package container // import "github.com/ory/dockertest/v3/docker/types/container" // IsBridge indicates whether container uses the bridge network stack // in windows it is given the name NAT diff --git a/docker/types/container/waitcondition.go b/docker/types/container/waitcondition.go index c75f32cf..9c99e345 100644 --- a/docker/types/container/waitcondition.go +++ b/docker/types/container/waitcondition.go @@ -1,4 +1,4 @@ -package container // import "github.com/ory/dockertest/docker/types/container" +package container // import "github.com/ory/dockertest/v3/docker/types/container" // WaitCondition is a type used to specify a container state for which // to wait. diff --git a/docker/types/filters/example_test.go b/docker/types/filters/example_test.go index 6caada61..7c81c53e 100644 --- a/docker/types/filters/example_test.go +++ b/docker/types/filters/example_test.go @@ -1,4 +1,4 @@ -package filters // import "github.com/ory/dockertest/docker/types/filters" +package filters // import "github.com/ory/dockertest/v3/docker/types/filters" func ExampleArgs_MatchKVList() { args := NewArgs( diff --git a/docker/types/filters/parse.go b/docker/types/filters/parse.go index 9c96c3db..293c93d8 100644 --- a/docker/types/filters/parse.go +++ b/docker/types/filters/parse.go @@ -1,7 +1,7 @@ /*Package filters provides tools for encoding a mapping of keys to a set of multiple values. */ -package filters // import "github.com/ory/dockertest/docker/types/filters" +package filters // import "github.com/ory/dockertest/v3/docker/types/filters" import ( "encoding/json" @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/ory/dockertest/docker/types/versions" + "github.com/ory/dockertest/v3/docker/types/versions" ) // Args stores a mapping of keys to a set of multiple values. diff --git a/docker/types/filters/parse_test.go b/docker/types/filters/parse_test.go index 01a5f93b..e9fccc83 100644 --- a/docker/types/filters/parse_test.go +++ b/docker/types/filters/parse_test.go @@ -1,4 +1,4 @@ -package filters // import "github.com/ory/dockertest/docker/types/filters" +package filters // import "github.com/ory/dockertest/v3/docker/types/filters" import ( "errors" diff --git a/docker/types/mount/mount.go b/docker/types/mount/mount.go index 5137c857..450377e2 100644 --- a/docker/types/mount/mount.go +++ b/docker/types/mount/mount.go @@ -1,4 +1,4 @@ -package mount // import "github.com/ory/dockertest/docker/types/mount" +package mount // import "github.com/ory/dockertest/v3/docker/types/mount" import ( "os" diff --git a/docker/types/network/network.go b/docker/types/network/network.go index 58689374..154acdff 100644 --- a/docker/types/network/network.go +++ b/docker/types/network/network.go @@ -1,4 +1,4 @@ -package network // import "github.com/ory/dockertest/docker/types/network" +package network // import "github.com/ory/dockertest/v3/docker/types/network" // Address represents an IP address type Address struct { diff --git a/docker/types/plugin_responses.go b/docker/types/plugin_responses.go index 5fe1945b..94237b68 100644 --- a/docker/types/plugin_responses.go +++ b/docker/types/plugin_responses.go @@ -1,4 +1,4 @@ -package types // import "github.com/ory/dockertest/docker/types" +package types // import "github.com/ory/dockertest/v3/docker/types" import ( "encoding/json" diff --git a/docker/types/registry/authenticate.go b/docker/types/registry/authenticate.go index ae96747c..6ac4872e 100644 --- a/docker/types/registry/authenticate.go +++ b/docker/types/registry/authenticate.go @@ -1,4 +1,4 @@ -package registry // import "github.com/ory/dockertest/docker/types/registry" +package registry // import "github.com/ory/dockertest/v3/docker/types/registry" // ---------------------------------------------------------------------------- // DO NOT EDIT THIS FILE diff --git a/docker/types/registry/registry.go b/docker/types/registry/registry.go index ac6a367f..12dae112 100644 --- a/docker/types/registry/registry.go +++ b/docker/types/registry/registry.go @@ -1,4 +1,4 @@ -package registry // import "github.com/ory/dockertest/docker/types/registry" +package registry // import "github.com/ory/dockertest/v3/docker/types/registry" import ( "encoding/json" diff --git a/docker/types/seccomp.go b/docker/types/seccomp.go index cd78378c..f602d6f6 100644 --- a/docker/types/seccomp.go +++ b/docker/types/seccomp.go @@ -1,4 +1,4 @@ -package types // import "github.com/ory/dockertest/docker/types" +package types // import "github.com/ory/dockertest/v3/docker/types" // Seccomp represents the config for a seccomp profile for syscall restriction. type Seccomp struct { diff --git a/docker/types/stats.go b/docker/types/stats.go index 8874788e..c8325667 100644 --- a/docker/types/stats.go +++ b/docker/types/stats.go @@ -1,6 +1,6 @@ // Package types is used for API stability in the types and response to the // consumers of the API stats endpoint. -package types // import "github.com/ory/dockertest/docker/types" +package types // import "github.com/ory/dockertest/v3/docker/types" import "time" diff --git a/docker/types/strslice/strslice.go b/docker/types/strslice/strslice.go index 7481eb8f..81ffb019 100644 --- a/docker/types/strslice/strslice.go +++ b/docker/types/strslice/strslice.go @@ -1,4 +1,4 @@ -package strslice // import "github.com/ory/dockertest/docker/types/strslice" +package strslice // import "github.com/ory/dockertest/v3/docker/types/strslice" import "encoding/json" diff --git a/docker/types/strslice/strslice_test.go b/docker/types/strslice/strslice_test.go index 37fa06ff..840452a2 100644 --- a/docker/types/strslice/strslice_test.go +++ b/docker/types/strslice/strslice_test.go @@ -1,4 +1,4 @@ -package strslice // import "github.com/ory/dockertest/docker/types/strslice" +package strslice // import "github.com/ory/dockertest/v3/docker/types/strslice" import ( "encoding/json" diff --git a/docker/types/types.go b/docker/types/types.go index 79108d60..d3383cd1 100644 --- a/docker/types/types.go +++ b/docker/types/types.go @@ -1,4 +1,4 @@ -package types // import "github.com/ory/dockertest/docker/types" +package types // import "github.com/ory/dockertest/v3/docker/types" import ( "errors" @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/ory/dockertest/docker/types/container" - "github.com/ory/dockertest/docker/types/filters" - "github.com/ory/dockertest/docker/types/mount" - "github.com/ory/dockertest/docker/types/network" - "github.com/ory/dockertest/docker/types/registry" + "github.com/ory/dockertest/v3/docker/types/container" + "github.com/ory/dockertest/v3/docker/types/filters" + "github.com/ory/dockertest/v3/docker/types/mount" + "github.com/ory/dockertest/v3/docker/types/network" + "github.com/ory/dockertest/v3/docker/types/registry" "github.com/docker/go-connections/nat" ) diff --git a/docker/types/versions/compare.go b/docker/types/versions/compare.go index 904584d1..0e1b17ca 100644 --- a/docker/types/versions/compare.go +++ b/docker/types/versions/compare.go @@ -1,4 +1,4 @@ -package versions // import "github.com/ory/dockertest/docker/types/versions" +package versions // import "github.com/ory/dockertest/v3/docker/types/versions" import ( "strconv" diff --git a/docker/types/versions/compare_test.go b/docker/types/versions/compare_test.go index 22a77ed4..08d8e0e5 100644 --- a/docker/types/versions/compare_test.go +++ b/docker/types/versions/compare_test.go @@ -1,4 +1,4 @@ -package versions // import "github.com/ory/dockertest/docker/types/versions" +package versions // import "github.com/ory/dockertest/v3/docker/types/versions" import ( "testing" diff --git a/docker/types/versions/v1p19/types.go b/docker/types/versions/v1p19/types.go index f4e641e6..ffa3020a 100644 --- a/docker/types/versions/v1p19/types.go +++ b/docker/types/versions/v1p19/types.go @@ -1,10 +1,10 @@ // Package v1p19 provides specific API types for the API version 1, patch 19. -package v1p19 // import "github.com/ory/dockertest/docker/types/versions/v1p19" +package v1p19 // import "github.com/ory/dockertest/v3/docker/types/versions/v1p19" import ( - "github.com/ory/dockertest/docker/types" - "github.com/ory/dockertest/docker/types/container" - "github.com/ory/dockertest/docker/types/versions/v1p20" + "github.com/ory/dockertest/v3/docker/types" + "github.com/ory/dockertest/v3/docker/types/container" + "github.com/ory/dockertest/v3/docker/types/versions/v1p20" "github.com/docker/go-connections/nat" ) diff --git a/docker/types/versions/v1p20/types.go b/docker/types/versions/v1p20/types.go index 987725d6..2848ea4f 100644 --- a/docker/types/versions/v1p20/types.go +++ b/docker/types/versions/v1p20/types.go @@ -1,9 +1,9 @@ // Package v1p20 provides specific API types for the API version 1, patch 20. -package v1p20 // import "github.com/ory/dockertest/docker/types/versions/v1p20" +package v1p20 // import "github.com/ory/dockertest/v3/docker/types/versions/v1p20" import ( - "github.com/ory/dockertest/docker/types" - "github.com/ory/dockertest/docker/types/container" + "github.com/ory/dockertest/v3/docker/types" + "github.com/ory/dockertest/v3/docker/types/container" "github.com/docker/go-connections/nat" ) diff --git a/dockertest.go b/dockertest.go index f3870ee9..5b955c69 100644 --- a/dockertest.go +++ b/dockertest.go @@ -11,7 +11,7 @@ import ( "time" "github.com/cenkalti/backoff" - dc "github.com/ory/dockertest/docker" + dc "github.com/ory/dockertest/v3/docker" "github.com/pkg/errors" ) diff --git a/dockertest_test.go b/dockertest_test.go index c973cf39..cb8cc2a1 100644 --- a/dockertest_test.go +++ b/dockertest_test.go @@ -11,7 +11,7 @@ import ( "time" _ "github.com/lib/pq" - dc "github.com/ory/dockertest/docker" + dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/go.mod b/go.mod index 9e0c3110..0dcac96d 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/opencontainers/go-digest v1.0.0-rc1 // indirect github.com/opencontainers/image-spec v1.0.1 github.com/opencontainers/runc v1.0.0-rc5 - github.com/ory/dockertest v3.3.5+incompatible github.com/pkg/errors v0.8.0 github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.0.5 diff --git a/go.sum b/go.sum index 02d00c70..2ff690c6 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,6 @@ github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVo github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v1.0.0-rc5 h1:rYjdzMDXVly2Av0RLs3nf/iVkaWh2UrDhuTdTT2KggQ= github.com/opencontainers/runc v1.0.0-rc5/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= -github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=