summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-10 18:39:39 +0200
committerGitHub <noreply@github.com>2020-04-10 18:39:39 +0200
commit1593d4c052fc0795e6fe31917edcb1ecbe5ee192 (patch)
tree0e38a7aa145157cb80100c4f922100cfbdde1a52 /vendor/github.com
parent2a8db9d17c5dd762366fe7c90304e76337e5d668 (diff)
parentdaca146f9d286d9e89fb96d46831f3183ae9dbd6 (diff)
downloadpodman-1593d4c052fc0795e6fe31917edcb1ecbe5ee192.tar.gz
podman-1593d4c052fc0795e6fe31917edcb1ecbe5ee192.tar.bz2
podman-1593d4c052fc0795e6fe31917edcb1ecbe5ee192.zip
Merge pull request #5785 from containers/dependabot/go_modules/github.com/containers/buildah-1.14.8
build(deps): bump github.com/containers/buildah from 1.14.7 to 1.14.8
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/containers/buildah/CHANGELOG.md8
-rw-r--r--vendor/github.com/containers/buildah/Makefile7
-rw-r--r--vendor/github.com/containers/buildah/buildah.go2
-rw-r--r--vendor/github.com/containers/buildah/changelog.txt8
4 files changed, 20 insertions, 5 deletions
diff --git a/vendor/github.com/containers/buildah/CHANGELOG.md b/vendor/github.com/containers/buildah/CHANGELOG.md
index 941a35535..ed4ba3967 100644
--- a/vendor/github.com/containers/buildah/CHANGELOG.md
+++ b/vendor/github.com/containers/buildah/CHANGELOG.md
@@ -2,6 +2,14 @@
# Changelog
+## v1.14.8 (2020-04-09)
+ Run (make vendor)
+ Run (make -C tests/tools vendor)
+ Run (go mod tidy) before (go mod vendor) again
+ Fix (make vendor)
+ Bump validation
+ Bump back to v1.15.0-dev
+
## v1.14.7 (2020-04-07)
Bump github.com/containers/image/v5 from 5.3.1 to 5.4.3
make vendor: run `tidy` after `vendor`
diff --git a/vendor/github.com/containers/buildah/Makefile b/vendor/github.com/containers/buildah/Makefile
index 371cefa7f..ced48a95a 100644
--- a/vendor/github.com/containers/buildah/Makefile
+++ b/vendor/github.com/containers/buildah/Makefile
@@ -142,10 +142,9 @@ vendor-in-container:
.PHONY: vendor
vendor:
- export GO111MODULE=on \
- $(GO) mod vendor && \
- $(GO) mod tidy && \
- $(GO) mod verify
+ GO111MODULE=on $(GO) mod tidy
+ GO111MODULE=on $(GO) mod vendor
+ GO111MODULE=on $(GO) mod verify
.PHONY: lint
lint: install.tools
diff --git a/vendor/github.com/containers/buildah/buildah.go b/vendor/github.com/containers/buildah/buildah.go
index 059f0edd8..6cfbbb73f 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.14.7"
+ Version = "1.14.8"
// 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 ebbfa5a64..4cd9a18df 100644
--- a/vendor/github.com/containers/buildah/changelog.txt
+++ b/vendor/github.com/containers/buildah/changelog.txt
@@ -1,3 +1,11 @@
+- Changelog for v1.14.8 (2020-04-09)
+ * Run (make vendor)
+ * Run (make -C tests/tools vendor)
+ * Run (go mod tidy) before (go mod vendor) again
+ * Fix (make vendor)
+ * Bump validation
+ * Bump back to v1.15.0-dev
+
- Changelog for v1.14.7 (2020-04-07)
* Bump github.com/containers/image/v5 from 5.3.1 to 5.4.3
* make vendor: run `tidy` after `vendor`