From 37fe4e86c284486c0ede084d579122c48ffe5dc1 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 13 Sep 2021 16:36:55 -0400 Subject: [PATCH] Bump to v1.23.0 [NO TESTS NEEDED] Signed-off-by: Daniel J Walsh --- CHANGELOG.md | 58 +++++++++++++++++++++++++++++++++++++++ changelog.txt | 57 ++++++++++++++++++++++++++++++++++++++ contrib/rpm/buildah.spec | 59 ++++++++++++++++++++++++++++++++++++++-- define/types.go | 2 +- release.sh | 24 +++++++++++++--- 5 files changed, 193 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dc7a3d72ab..1864a45649b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,64 @@ # Changelog +## v1.23.0 (2021-09-13) + + Vendor in containers/common v0.44.0 + build(deps): bump github.com/containers/storage from 1.35.0 to 1.36.0 + Update 05-openshift-rootless-build.md + build(deps): bump github.com/opencontainers/selinux from 1.8.4 to 1.8.5 + .cirrus.yml: run cross_build_task on Big Sur + Makefile: update cross targets + Add support for rootless overlay mounts + Cirrus: Increase unit-test timeout + Docs: Clarify rmi w/ manifest/index use + build: mirror --authfile to filesystem if pointing to FD instead of file + Fix build with .git url with branch + manifest: rm should remove only manifests not referenced images. + vendor: bump c/common to v0.43.3-0.20210902095222-a7acc160fb25 + Avoid rehashing and noop compression writer + corrected man page section; .conf file to mention its man page + copy: add --max-parallel-downloads to tune that copy option + copier.Get(): try to avoid descending into directories + tag: Support tagging manifest list instead of resolving to images + Install new manpages to correct sections + conformance: tighten up exception specifications + Add support for libsubid + Add epoch time field to buildah images + Fix ownership of /home/build/.local/share/containers + build(deps): bump github.com/containers/image/v5 from 5.15.2 to 5.16.0 + Rename bud to build, while keeping an alias for to bud. + Replace golang.org/x/crypto/ssh/terminal with golang.org/x/term + build(deps): bump github.com/opencontainers/runc from 1.0.1 to 1.0.2 + build(deps): bump github.com/onsi/gomega from 1.15.0 to 1.16.0 + build(deps): bump github.com/fsouza/go-dockerclient from 1.7.3 to 1.7.4 + build(deps): bump github.com/containers/common from 0.43.1 to 0.43.2 + Move DiscoverContainerfile to pkg/util directory + build(deps): bump github.com/containers/image/v5 from 5.15.1 to 5.15.2 + Remove some references to Docker + build(deps): bump github.com/containers/image/v5 from 5.15.0 to 5.15.1 + imagebuildah: handle --manifest directly + build(deps): bump github.com/containers/common from 0.42.1 to 0.43.1 + build(deps): bump github.com/opencontainers/selinux from 1.8.3 to 1.8.4 + executor: make sure imageMap is updated with terminatedStage + tests/serve/serve.go: use a kernel-assigned port + Bump go for vendor-in-container from 1.13 to 1.16 + imagebuildah: move multiple-platform building internal + Adds GenerateStructure helper function to support rootfs-overlay. + Run codespell to fix spelling + Implement SSH RUN mount + build(deps): bump github.com/onsi/gomega from 1.14.0 to 1.15.0 + Fix resolv.conf content with run --net=private + run: fix nil deref using the option's logger + build(deps): bump github.com/containerd/containerd from 1.5.1 to 1.5.5 + make vendor-in-container + bud: teach --platform to take a list + set base-image annotations + build(deps): bump github.com/opencontainers/selinux from 1.8.2 to 1.8.3 + [CI:DOCS] Fix CHANGELOG.md + Bump to v1.23.0-dev [NO TESTS NEEDED] + Accept repositories on login/logout + ## v1.22.0 (2021-08-02) c/image, c/storage, c/common vendor before Podman 3.3 release WIP: tests: new assert() diff --git a/changelog.txt b/changelog.txt index 6755535b189..24a1010168d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,60 @@ +- Changelog for v1.23.0 (2021-09-13) + * Vendor in containers/common v0.44.0 + * build(deps): bump github.com/containers/storage from 1.35.0 to 1.36.0 + * Update 05-openshift-rootless-build.md + * build(deps): bump github.com/opencontainers/selinux from 1.8.4 to 1.8.5 + * .cirrus.yml: run cross_build_task on Big Sur + * Makefile: update cross targets + * Add support for rootless overlay mounts + * Cirrus: Increase unit-test timeout + * Docs: Clarify rmi w/ manifest/index use + * build: mirror --authfile to filesystem if pointing to FD instead of file + * Fix build with .git url with branch + * manifest: rm should remove only manifests not referenced images. + * vendor: bump c/common to v0.43.3-0.20210902095222-a7acc160fb25 + * Avoid rehashing and noop compression writer + * corrected man page section; .conf file to mention its man page + * copy: add --max-parallel-downloads to tune that copy option + * copier.Get(): try to avoid descending into directories + * tag: Support tagging manifest list instead of resolving to images + * Install new manpages to correct sections + * conformance: tighten up exception specifications + * Add support for libsubid + * Add epoch time field to buildah images + * Fix ownership of /home/build/.local/share/containers + * build(deps): bump github.com/containers/image/v5 from 5.15.2 to 5.16.0 + * Rename bud to build, while keeping an alias for to bud. + * Replace golang.org/x/crypto/ssh/terminal with golang.org/x/term + * build(deps): bump github.com/opencontainers/runc from 1.0.1 to 1.0.2 + * build(deps): bump github.com/onsi/gomega from 1.15.0 to 1.16.0 + * build(deps): bump github.com/fsouza/go-dockerclient from 1.7.3 to 1.7.4 + * build(deps): bump github.com/containers/common from 0.43.1 to 0.43.2 + * Move DiscoverContainerfile to pkg/util directory + * build(deps): bump github.com/containers/image/v5 from 5.15.1 to 5.15.2 + * Remove some references to Docker + * build(deps): bump github.com/containers/image/v5 from 5.15.0 to 5.15.1 + * imagebuildah: handle --manifest directly + * build(deps): bump github.com/containers/common from 0.42.1 to 0.43.1 + * build(deps): bump github.com/opencontainers/selinux from 1.8.3 to 1.8.4 + * executor: make sure imageMap is updated with terminatedStage + * tests/serve/serve.go: use a kernel-assigned port + * Bump go for vendor-in-container from 1.13 to 1.16 + * imagebuildah: move multiple-platform building internal + * Adds GenerateStructure helper function to support rootfs-overlay. + * Run codespell to fix spelling + * Implement SSH RUN mount + * build(deps): bump github.com/onsi/gomega from 1.14.0 to 1.15.0 + * Fix resolv.conf content with run --net=private + * run: fix nil deref using the option's logger + * build(deps): bump github.com/containerd/containerd from 1.5.1 to 1.5.5 + * make vendor-in-container + * bud: teach --platform to take a list + * set base-image annotations + * build(deps): bump github.com/opencontainers/selinux from 1.8.2 to 1.8.3 + * [CI:DOCS] Fix CHANGELOG.md + * Bump to v1.23.0-dev [NO TESTS NEEDED] + * Accept repositories on login/logout + - Changelog for v1.22.0 (2021-08-02) * c/image, c/storage, c/common vendor before Podman 3.3 release * WIP: tests: new assert() diff --git a/contrib/rpm/buildah.spec b/contrib/rpm/buildah.spec index 0a3890255cf..4b788af39ff 100644 --- a/contrib/rpm/buildah.spec +++ b/contrib/rpm/buildah.spec @@ -26,7 +26,7 @@ Name: buildah # Bump version in define/types.go too -Version: 1.23.0-dev +Version: 1.23.0 Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used to creating OCI Images License: ASL 2.0 @@ -100,7 +100,62 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/* %changelog -* Mon Aug 2, 2021 Tom Sweeney 1.23.0-dev-1 +* Mon Sep 13, 2021 Daniel J Walsh 1.23.0-1 +- Vendor in containers/common v0.44.0 +- build(deps): bump github.com/containers/storage from 1.35.0 to 1.36.0 +- Update 05-openshift-rootless-build.md +- build(deps): bump github.com/opencontainers/selinux from 1.8.4 to 1.8.5 +- .cirrus.yml: run cross_build_task on Big Sur +- Makefile: update cross targets +- Add support for rootless overlay mounts +- Cirrus: Increase unit-test timeout +- Docs: Clarify rmi w/ manifest/index use +- build: mirror --authfile to filesystem if pointing to FD instead of file +- Fix build with .git url with branch +- manifest: rm should remove only manifests not referenced images. +- vendor: bump c/common to v0.43.3-0.20210902095222-a7acc160fb25 +- Avoid rehashing and noop compression writer +- corrected man page section; .conf file to mention its man page +- copy: add --max-parallel-downloads to tune that copy option +- copier.Get(): try to avoid descending into directories +- tag: Support tagging manifest list instead of resolving to images +- Install new manpages to correct sections +- conformance: tighten up exception specifications +- Add support for libsubid +- Add epoch time field to buildah images +- Fix ownership of /home/build/.local/share/containers +- build(deps): bump github.com/containers/image/v5 from 5.15.2 to 5.16.0 +- Rename bud to build, while keeping an alias for to bud. +- Replace golang.org/x/crypto/ssh/terminal with golang.org/x/term +- build(deps): bump github.com/opencontainers/runc from 1.0.1 to 1.0.2 +- build(deps): bump github.com/onsi/gomega from 1.15.0 to 1.16.0 +- build(deps): bump github.com/fsouza/go-dockerclient from 1.7.3 to 1.7.4 +- build(deps): bump github.com/containers/common from 0.43.1 to 0.43.2 +- Move DiscoverContainerfile to pkg/util directory +- build(deps): bump github.com/containers/image/v5 from 5.15.1 to 5.15.2 +- Remove some references to Docker +- build(deps): bump github.com/containers/image/v5 from 5.15.0 to 5.15.1 +- imagebuildah: handle --manifest directly +- build(deps): bump github.com/containers/common from 0.42.1 to 0.43.1 +- build(deps): bump github.com/opencontainers/selinux from 1.8.3 to 1.8.4 +- executor: make sure imageMap is updated with terminatedStage +- tests/serve/serve.go: use a kernel-assigned port +- Bump go for vendor-in-container from 1.13 to 1.16 +- imagebuildah: move multiple-platform building internal +- Adds GenerateStructure helper function to support rootfs-overlay. +- Run codespell to fix spelling +- Implement SSH RUN mount +- build(deps): bump github.com/onsi/gomega from 1.14.0 to 1.15.0 +- Fix resolv.conf content with run --net=private +- run: fix nil deref using the option's logger +- build(deps): bump github.com/containerd/containerd from 1.5.1 to 1.5.5 +- make vendor-in-container +- bud: teach --platform to take a list +- set base-image annotations +- build(deps): bump github.com/opencontainers/selinux from 1.8.2 to 1.8.3 +- [CI:DOCS] Fix CHANGELOG.md +- Bump to v1.23.0-dev [NO TESTS NEEDED] +- Accept repositories on login/logout * Mon Aug 2, 2021 Tom Sweeney 1.22.0-1 - c/image, c/storage, c/common vendor before Podman 3.3 release diff --git a/define/types.go b/define/types.go index 81c0d0b97f4..fc56aeef8ba 100644 --- a/define/types.go +++ b/define/types.go @@ -29,7 +29,7 @@ const ( Package = "buildah" // Version for the Package. Bump version in contrib/rpm/buildah.spec // too. - Version = "1.23.0-dev" + Version = "1.23.0" // DefaultRuntime if containers.conf fails. DefaultRuntime = "runc" diff --git a/release.sh b/release.sh index ef1c248c704..007f238d880 100755 --- a/release.sh +++ b/release.sh @@ -56,6 +56,13 @@ write_changelog() echo >>.changelog.txt && cat changelog.txt >>.changelog.txt && mv -f .changelog.txt changelog.txt + + echo " +## v${VERSION} (${DATE}) +" >.CHANGELOG.md && + git log --no-merges --format=' %s' "${LAST_TAG}..HEAD" >>.CHANGELOG.md && + sed -i -e '/# Changelog/r .CHANGELOG.md' CHANGELOG.md && + rm -f .CHANGELOG.md } release_commit() @@ -64,7 +71,10 @@ release_commit() write_spec_version "${VERSION}" && write_spec_changelog "${VERSION}" && write_changelog && - git commit -asm "Bump to v${VERSION}" + git commit -asm "Bump to v${VERSION} + +[NO TESTS NEEDED] +" } dev_version_commit() @@ -72,18 +82,24 @@ dev_version_commit() write_go_version "${NEXT_VERSION}-dev" && write_spec_version "${NEXT_VERSION}-dev" && write_spec_changelog "${NEXT_VERSION}-dev" && - git commit -asm "Bump to v${NEXT_VERSION}-dev" + git commit -asm "Bump to v${NEXT_VERSION}-dev + +[NO TESTS NEEDED] +" } epoch_commit() { LOCAL_EPOCH="$1" write_makefile_epoch "${LOCAL_EPOCH}" && - git commit -asm 'Bump gitvalidation epoch' + git commit -asm 'Bump gitvalidation epoch + + [NO TESTS NEEDED] +' } git fetch origin && -git checkout -b "bump-${VERSION}" origin/master && +git checkout -b "bump-${VERSION}" origin/main && EPOCH=$(git rev-parse HEAD) && release_commit && git tag -s -m "version ${VERSION}" "v${VERSION}" &&