Bump to Replace golang 1.10 with 1.12

Vendor in containers/storage v1.12.2 Signed-off-by: Daniel J Walsh <[email protected]> Closes: #1384 Approved by: vrothberg
containers · Apr 14, 2019 · fcc12bd · fcc12bd
1 parent d43787b
commit fcc12bd
Show file tree

Hide file tree

Showing 12 changed files with 142 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,8 @@ language: go
 dist: xenial
 sudo: required
 go:
-    - 1.10.x
     - 1.11.x
+    - 1.12.x
     - tip
 
 env:

diff --git a/tests/validate/govet.sh b/tests/validate/govet.sh
@@ -8,7 +8,7 @@ if ! test -x ./btrfs_tag.sh ; then
 fi
 tags="$(./btrfs_tag.sh) $(./btrfs_installed_tag.sh) $(./libdm_tag.sh) $(./ostree_tag.sh) $(./selinux_tag.sh)"
 
-for package in $(go list ./... | grep -v /vendor/) ; do
+for package in $(go list ./... | grep -v /vendor/ | grep -v /docker) ; do
 	if ! go vet -tags "$tags" ${package} ; then
 		echo Error: source package ${package} does not pass go vet.
 		exit 1

diff --git a/vendor.conf b/vendor.conf
@@ -8,7 +8,7 @@ github.com/vbauerster/mpb v3.3.4
 github.com/mattn/go-isatty v0.0.4
 github.com/VividCortex/ewma v1.1.1
 github.com/boltdb/bolt v1.3.1
-github.com/containers/storage v1.12.1
+github.com/containers/storage v1.12.2
 github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716
 github.com/docker/docker 54dddadc7d5d89fe0be88f76979f6f6ab0dede83
 github.com/docker/docker-credential-helpers v0.6.1

diff --git a/vendor/github.com/containers/storage/containers_ffjson.go b/vendor/github.com/containers/storage/containers_ffjson.go
diff --git a/...m/containers/storage/drivers/copy/copy.go → ...ainers/storage/drivers/copy/copy_linux.go b/...m/containers/storage/drivers/copy/copy.go → ...ainers/storage/drivers/copy/copy_linux.go
diff --git a/vendor/github.com/containers/storage/drivers/copy/copy_unsupported.go b/vendor/github.com/containers/storage/drivers/copy/copy_unsupported.go
diff --git a/vendor/github.com/containers/storage/images_ffjson.go b/vendor/github.com/containers/storage/images_ffjson.go
diff --git a/vendor/github.com/containers/storage/lockfile.go b/vendor/github.com/containers/storage/lockfile.go
diff --git a/vendor/github.com/containers/storage/lockfile_unix.go b/vendor/github.com/containers/storage/lockfile_unix.go
diff --git a/vendor/github.com/containers/storage/lockfile_windows.go b/vendor/github.com/containers/storage/lockfile_windows.go
diff --git a/vendor/github.com/containers/storage/store.go b/vendor/github.com/containers/storage/store.go
diff --git a/vendor/github.com/containers/storage/utils.go b/vendor/github.com/containers/storage/utils.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,8 @@ language: go @@
     dist: xenial
     sudo: required
     go:
-        - 1.10.x
         - 1.11.x
+        - 1.12.x
         - tip
     env:
@@ Expand Down @@