Merge pull request #5919 from nalind/v1.37.6

[release-1.37] tag v1.37.6
containers · Jan 22, 2025 · fd39521 · fd39521
2 parents 419d6fb + 75ef41e
commit fd39521
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -6,7 +6,7 @@ env:
     #### Global variables used for all tasks
     ####
     # Name of the ultimate destination branch for this CI run, PR or post-merge.
-    DEST_BRANCH: "main"
+    DEST_BRANCH: "release-1.37"
     GOPATH: "/var/tmp/go"
     GOSRC: "${GOPATH}/src/github.com/containers/buildah"
     # Overrides default location (/tmp/cirrus) for repo clone

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 # Changelog
 
+## v1.37.6 (2025-01-20)
+
+    Fix TOCTOU error when bind and cache mounts use "src" values
+    define.TempDirForURL(): always use an intermediate subdirectory
+    internal/volume.GetBindMount(): discard writes in bind mounts
+    pkg/overlay: add a MountLabel flag to Options
+    pkg/overlay: add a ForceMount flag to Options
+    Add internal/volumes.bindFromChroot()
+    Add an internal/open package
+    Allow cache mounts to be stages or additional build contexts
+    [release-1.37][CI:DOCS] Touch up changelogs
+    [release-1.37][CI:DOCS] touchup changelog
+    Update CHANGELOG.md
+
 ## v1.37.5 (2024-10-17)
 
     Bump the containers/storage library to v1.55.1 - Resolves CVE-2024-9676

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,16 @@
+- Changelog for v1.37.6 (2025-01-20)
+  * Fix TOCTOU error when bind and cache mounts use "src" values
+  * define.TempDirForURL(): always use an intermediate subdirectory
+  * internal/volume.GetBindMount(): discard writes in bind mounts
+  * pkg/overlay: add a MountLabel flag to Options
+  * pkg/overlay: add a ForceMount flag to Options
+  * Add internal/volumes.bindFromChroot()
+  * Add an internal/open package
+  * Allow cache mounts to be stages or additional build contexts
+  * [release-1.37][CI:DOCS] Touch up changelogs
+  * [release-1.37][CI:DOCS] touchup changelog
+  * Update CHANGELOG.md
+
 - Changelog for v1.37.5 (2024-10-17)
   * Bump the containers/storage library to v1.55.1 - Resolves CVE-2024-9676
   * Properly validate cache IDs and sources - Resolves CVE-2024-9675

diff --git 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.37.5"
+	Version = "1.37.6"
 
 	// DefaultRuntime if containers.conf fails.
 	DefaultRuntime = "runc"