Merge pull request #5370 from TomSweeneyRedHat/dev/tsweeney/b1141

Bump to Buildah v1.14.1

6 files changed, 115 insertions, 3 deletions

diff --git a/go.mod b/go.mod
index b6f62d65c..7a53f6b07 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b
 	github.com/containernetworking/cni v0.7.2-0.20190904153231-83439463f784
 	github.com/containernetworking/plugins v0.8.5
-	github.com/containers/buildah v1.14.1-0.20200227103754-f0c3fd7c3d34
+	github.com/containers/buildah v1.14.1
 	github.com/containers/common v0.4.2
 	github.com/containers/conmon v2.0.10+incompatible
 	github.com/containers/image/v5 v5.2.1
diff --git a/go.sum b/go.sum
index 00b8d5d00..62c27aec2 100644
--- a/go.sum
+++ b/go.sum
@@ -78,6 +78,8 @@ github.com/containers/buildah v1.14.1-0.20200225113533-39bd7e0a7a73 h1:TyGEOd0O6
 github.com/containers/buildah v1.14.1-0.20200225113533-39bd7e0a7a73/go.mod h1:sdMVVcCTvvAj9o9dk/j6EnNJJadjxqjcI4Yy9WoWxSg=
 github.com/containers/buildah v1.14.1-0.20200227103754-f0c3fd7c3d34 h1:SaK9ADT5JdVL29Z8snwl+bqmi1usnNyis+7Hd5+jJjw=
 github.com/containers/buildah v1.14.1-0.20200227103754-f0c3fd7c3d34/go.mod h1:sdMVVcCTvvAj9o9dk/j6EnNJJadjxqjcI4Yy9WoWxSg=
+github.com/containers/buildah v1.14.1 h1:H0uubyWJN98xRFmwzJeJDb5NIypx+sPcJu5kCzO6hGs=
+github.com/containers/buildah v1.14.1/go.mod h1:sdMVVcCTvvAj9o9dk/j6EnNJJadjxqjcI4Yy9WoWxSg=
 github.com/containers/common v0.0.7 h1:eKYZLKfJ2d/RNDgecLDFv45cHb4imYzIcrQHx1Y029M=
 github.com/containers/common v0.0.7/go.mod h1:lhWV3MLhO1+KGE2x6v9+K38MxpjXGso+edmpkFnCOqI=
 github.com/containers/common v0.3.0 h1:9ysL/OfPcMls1Ac3jzFA4XZJVSD/JG7Dst3uQSwQtwA=
diff --git a/vendor/github.com/containers/buildah/CHANGELOG.md b/vendor/github.com/containers/buildah/CHANGELOG.md
index 3122e90a7..cb9e6f7c4 100644
--- a/vendor/github.com/containers/buildah/CHANGELOG.md
+++ b/vendor/github.com/containers/buildah/CHANGELOG.md
@@ -2,6 +2,61 @@
 
 # Changelog
 
+## v1.14.1 (2020-02-27)
+    Search for local runtime per values in containers.conf
+    Set correct ownership on working directory
+    BATS : in teardown, umount stale mounts
+    Bump github.com/spf13/cobra from 0.0.5 to 0.0.6
+    Bump github.com/fsouza/go-dockerclient from 1.6.1 to 1.6.3
+    Bump github.com/stretchr/testify from 1.4.0 to 1.5.1
+    Replace unix with syscall to allow vendoring into libpod
+    Update to containers/common v0.4.1
+    Improve remote manifest retrieval
+    Fix minor spelling errors in containertools README
+    Clear the right variable in buildahimage
+    Correct a couple of incorrect format specifiers
+    Update to containers/common v0.3.0
+    manifest push --format: force an image type, not a list type
+    run: adjust the order in which elements are added to $PATH
+    getDateAndDigestAndSize(): handle creation time not being set
+    Bump github.com/containers/common from 0.2.0 to 0.2.1
+    include installation steps for CentOS 8 and Stream
+    include installation steps for CentOS7 and forks
+    Adjust Ubuntu install info to also work on Pop!_OS
+    Make the commit id clear like Docker
+    Show error on copied file above context directory in build
+    Bump github.com/containers/image/v5 from 5.2.0 to 5.2.1
+    pull/from/commit/push: retry on most failures
+    Makefile: fix install.cni.sudo
+    Repair buildah so it can use containers.conf on the server side
+    Bump github.com/mattn/go-shellwords from 1.0.9 to 1.0.10
+    Bump github.com/fsouza/go-dockerclient from 1.6.0 to 1.6.1
+    Fixing formatting & build instructions
+    Add Code of Conduct
+    Bors: Fix no. req. github reviews
+    Cirrus+Bors: Simplify temp branch skipping
+    Bors-ng: Add documentation and status-icon
+    Bump github.com/onsi/ginkgo from 1.11.0 to 1.12.0
+    fix XDG_RUNTIME_DIR for authfile
+    Cirrus: Disable F29 testing
+    Cirrus: Add jq package
+    Cirrus: Fix lint + validation using wrong epoch
+    Stop using fedorproject registry
+    Bors: Workaround ineffective required statuses
+    Bors: Enable app + Disable Travis
+    Cirrus: Add standardized log-collection
+    Cirrus: Improve automated lint + validation
+    Allow passing options to golangci-lint
+    Cirrus: Fixes from review feedback
+    Cirrus: Temporarily ignore VM testing failures
+    Cirrus: Migrate off papr + implement VM testing
+    Cirrus: Update packages + fixes for get_ci_vm.sh
+    Show validation command-line
+    Skip overlay test w/ vfs driver
+    use alpine, not centos, for various tests
+    Flake handling: cache and prefetch images
+    Bump to v1.15.0-dev
+
 ## v1.14.0 (2020-02-05)
     bump github.com/mtrmac/gpgme
     Update containers/common to v0.1.4
diff --git a/vendor/github.com/containers/buildah/buildah.go b/vendor/github.com/containers/buildah/buildah.go
index 2ece11acd..9a947c602 100644
--- a/vendor/github.com/containers/buildah/buildah.go
+++ b/vendor/github.com/containers/buildah/buildah.go
@@ -27,7 +27,7 @@ const (
 	Package = "buildah"
 	// Version for the Package.  Bump version in contrib/rpm/buildah.spec
 	// too.
-	Version = "1.15.0-dev"
+	Version = "1.14.1"
 	// The value we use to identify what type of information, currently a
 	// serialized Builder structure, we are using as per-container state.
 	// This should only be changed when we make incompatible changes to
diff --git a/vendor/github.com/containers/buildah/changelog.txt b/vendor/github.com/containers/buildah/changelog.txt
index 8ca371869..a435377b1 100644
--- a/vendor/github.com/containers/buildah/changelog.txt
+++ b/vendor/github.com/containers/buildah/changelog.txt
@@ -1,3 +1,58 @@
+- Changelog for v1.14.1 (2020-02-27)
+  * Search for local runtime per values in containers.conf
+  * Set correct ownership on working directory
+  * BATS : in teardown, umount stale mounts
+  * Bump github.com/spf13/cobra from 0.0.5 to 0.0.6
+  * Bump github.com/fsouza/go-dockerclient from 1.6.1 to 1.6.3
+  * Bump github.com/stretchr/testify from 1.4.0 to 1.5.1
+  * Replace unix with syscall to allow vendoring into libpod
+  * Update to containers/common v0.4.1
+  * Improve remote manifest retrieval
+  * Fix minor spelling errors in containertools README
+  * Clear the right variable in buildahimage
+  * Correct a couple of incorrect format specifiers
+  * Update to containers/common v0.3.0
+  * manifest push --format: force an image type, not a list type
+  * run: adjust the order in which elements are added to $PATH
+  * getDateAndDigestAndSize(): handle creation time not being set
+  * Bump github.com/containers/common from 0.2.0 to 0.2.1
+  * include installation steps for CentOS 8 and Stream
+  * include installation steps for CentOS7 and forks
+  * Adjust Ubuntu install info to also work on Pop!_OS
+  * Make the commit id clear like Docker
+  * Show error on copied file above context directory in build
+  * Bump github.com/containers/image/v5 from 5.2.0 to 5.2.1
+  * pull/from/commit/push: retry on most failures
+  * Makefile: fix install.cni.sudo
+  * Repair buildah so it can use containers.conf on the server side
+  * Bump github.com/mattn/go-shellwords from 1.0.9 to 1.0.10
+  * Bump github.com/fsouza/go-dockerclient from 1.6.0 to 1.6.1
+  * Fixing formatting & build instructions
+  * Add Code of Conduct
+  * Bors: Fix no. req. github reviews
+  * Cirrus+Bors: Simplify temp branch skipping
+  * Bors-ng: Add documentation and status-icon
+  * Bump github.com/onsi/ginkgo from 1.11.0 to 1.12.0
+  * fix XDG_RUNTIME_DIR for authfile
+  * Cirrus: Disable F29 testing
+  * Cirrus: Add jq package
+  * Cirrus: Fix lint + validation using wrong epoch
+  * Stop using fedorproject registry
+  * Bors: Workaround ineffective required statuses
+  * Bors: Enable app + Disable Travis
+  * Cirrus: Add standardized log-collection
+  * Cirrus: Improve automated lint + validation
+  * Allow passing options to golangci-lint
+  * Cirrus: Fixes from review feedback
+  * Cirrus: Temporarily ignore VM testing failures
+  * Cirrus: Migrate off papr + implement VM testing
+  * Cirrus: Update packages + fixes for get_ci_vm.sh
+  * Show validation command-line
+  * Skip overlay test w/ vfs driver
+  * use alpine, not centos, for various tests
+  * Flake handling: cache and prefetch images
+  * Bump to v1.15.0-dev
+
 - Changelog for v1.14.0 (2020-02-05)
   * bump github.com/mtrmac/gpgme
   * Update containers/common to v0.1.4
diff --git a/vendor/modules.txt b/vendor/modules.txt
index a0adafc5f..20a3ac69d 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -62,7 +62,7 @@ github.com/containernetworking/plugins/pkg/ns
 github.com/containernetworking/plugins/pkg/utils/hwaddr
 github.com/containernetworking/plugins/plugins/ipam/host-local/backend
 github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator
-# github.com/containers/buildah v1.14.1-0.20200227103754-f0c3fd7c3d34
+# github.com/containers/buildah v1.14.1
 github.com/containers/buildah
 github.com/containers/buildah/bind
 github.com/containers/buildah/chroot