From 9513cb8c7bec0f7789c696aee4d252ebf85194cc Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Tue, 3 Dec 2019 11:48:49 -0500 Subject: [PATCH 1/2] Bump to v1.11.6 Signed-off-by: TomSweeneyRedHat --- CHANGELOG.md | 13 +++++++++++++ buildah.go | 2 +- changelog.txt | 13 +++++++++++++ contrib/rpm/buildah.spec | 15 +++++++++++++-- 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb823ebb2c..a0baf30e99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ # Changelog +## v1.11.6 (2019-12-03) + Handle missing equal sign in --from and --chown flags for COPY/ADD + bud COPY does not download URL + Bump github.com/onsi/gomega from 1.7.0 to 1.7.1 + Fix .dockerignore exclude regression + Ran buildah through codespell + commit(docker): always set ContainerID and ContainerConfig + Touch up commit man page image parameter + Add builder identity annotations. + info: use util.Runtime() + Bump github.com/onsi/ginkgo from 1.10.2 to 1.10.3 + Bump back to v1.12.0-dev + ## v1.11.5 (2019-11-11) Enhance error on unsafe symbolic link targets Add OCIRuntime to info diff --git a/buildah.go b/buildah.go index b3262e28d1..bceafc241f 100644 --- a/buildah.go +++ b/buildah.go @@ -27,7 +27,7 @@ const ( Package = "buildah" // Version for the Package. Bump version in contrib/rpm/buildah.spec // too. - Version = "1.12.0-dev" + Version = "1.11.6" // 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/changelog.txt b/changelog.txt index 098e6d6d4f..58d784e35a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,16 @@ +- Changelog for v1.11.6 (2019-12-03) + * Handle missing equal sign in --from and --chown flags for COPY/ADD + * bud COPY does not download URL + * Bump github.com/onsi/gomega from 1.7.0 to 1.7.1 + * Fix .dockerignore exclude regression + * Ran buildah through codespell + * commit(docker): always set ContainerID and ContainerConfig + * Touch up commit man page image parameter + * Add builder identity annotations. + * info: use util.Runtime() + * Bump github.com/onsi/ginkgo from 1.10.2 to 1.10.3 + * Bump back to v1.12.0-dev + - Changelog for v1.11.5 (2019-11-11) * Enhance error on unsafe symbolic link targets * Add OCIRuntime to info diff --git a/contrib/rpm/buildah.spec b/contrib/rpm/buildah.spec index 9102647d31..d0420a7a0d 100644 --- a/contrib/rpm/buildah.spec +++ b/contrib/rpm/buildah.spec @@ -26,7 +26,7 @@ Name: buildah # Bump version in buildah.go too -Version: 1.12.0-dev +Version: 1.11.6 Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used to creating OCI Images License: ASL 2.0 @@ -99,7 +99,18 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/* %changelog -* Mon Nov 11, 2019 Tom Sweeney 1.12.0-dev-1 +* Tue Dec 3, 2019 Tom Sweeney 1.11.6-1 +- Handle missing equal sign in --from and --chown flags for COPY/ADD +- bud COPY does not download URL +- Bump github.com/onsi/gomega from 1.7.0 to 1.7.1 +- Fix .dockerignore exclude regression +- Ran buildah through codespell +- commit(docker): always set ContainerID and ContainerConfig +- Touch up commit man page image parameter +- Add builder identity annotations. +- info: use util.Runtime() +- Bump github.com/onsi/ginkgo from 1.10.2 to 1.10.3 +- Bump back to v1.12.0-dev * Mon Nov 11, 2019 Tom Sweeney 1.11.5-1 - Enhance error on unsafe symbolic link targets From 08eeb621883ad83ca349051e6de7f0d0fcc57fb2 Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Tue, 3 Dec 2019 12:02:01 -0500 Subject: [PATCH 2/2] Bump back to v1.12.0-dev Signed-off-by: TomSweeneyRedHat --- buildah.go | 2 +- contrib/rpm/buildah.spec | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/buildah.go b/buildah.go index bceafc241f..b3262e28d1 100644 --- a/buildah.go +++ b/buildah.go @@ -27,7 +27,7 @@ const ( Package = "buildah" // Version for the Package. Bump version in contrib/rpm/buildah.spec // too. - Version = "1.11.6" + Version = "1.12.0-dev" // 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/contrib/rpm/buildah.spec b/contrib/rpm/buildah.spec index d0420a7a0d..50b84080f0 100644 --- a/contrib/rpm/buildah.spec +++ b/contrib/rpm/buildah.spec @@ -26,7 +26,7 @@ Name: buildah # Bump version in buildah.go too -Version: 1.11.6 +Version: 1.12.0-dev Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used to creating OCI Images License: ASL 2.0 @@ -99,6 +99,8 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/* %changelog +* Tue Dec 3, 2019 Tom Sweeney 1.12.0-dev-1 + * Tue Dec 3, 2019 Tom Sweeney 1.11.6-1 - Handle missing equal sign in --from and --chown flags for COPY/ADD - bud COPY does not download URL