From f18868d066e594e5cbf5eadd10d7347482965372 Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Sat, 18 Nov 2023 19:31:39 -0500 Subject: [PATCH 1/2] Bump to v1.31.1 As the title says. Quick fix for Podman test issue and BuildKit CVE. [NO TESTS NEEDED] Signed-off-by: TomSweeneyRedHat --- CHANGELOG.md | 6 ++++++ changelog.txt | 5 +++++ define/types.go | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d578ed9387..ace785e794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ # Changelog +## v1.31.1 (2023-11-18) + + fix(deps): update module github.com/moby/buildkit to v0.11.4 [security] + test,heredoc: use fedora instead of docker.io/library/python:latest + Bump to v1.33.1-dev + ## v1.33.0 (2023-11-17) Never omit layers for emptyLayer instructions when squashing/cwing diff --git a/changelog.txt b/changelog.txt index a47dae0aab..ff7a2b7741 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +- Changelog for v1.31.1 (2023-11-18) + * fix(deps): update module github.com/moby/buildkit to v0.11.4 [security] + * test,heredoc: use fedora instead of docker.io/library/python:latest + * Bump to v1.33.1-dev + - Changelog for v1.33.0 (2023-11-17) * Never omit layers for emptyLayer instructions when squashing/cwing * Add OverrideChanges and OverrideConfig to CommitOptions diff --git a/define/types.go b/define/types.go index f2bc11c786..014a7d6044 100644 --- a/define/types.go +++ b/define/types.go @@ -29,7 +29,7 @@ const ( // identify working containers. Package = "buildah" // Version for the Package. Also used by .packit.sh for Packit builds. - Version = "1.33.1-dev" + Version = "1.31.1" // DefaultRuntime if containers.conf fails. DefaultRuntime = "runc" From 6d66008b671cb0529ca204c10821381f2b5482a3 Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Sat, 18 Nov 2023 19:34:01 -0500 Subject: [PATCH 2/2] Bump to v1.31.2-dev As the title says. [NO NEW TESTS NEEDED] Signed-off-by: TomSweeneyRedHat --- define/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/define/types.go b/define/types.go index 014a7d6044..1da4bb9075 100644 --- a/define/types.go +++ b/define/types.go @@ -29,7 +29,7 @@ const ( // identify working containers. Package = "buildah" // Version for the Package. Also used by .packit.sh for Packit builds. - Version = "1.31.1" + Version = "1.31.2-dev" // DefaultRuntime if containers.conf fails. DefaultRuntime = "runc"