Merge pull request #3881 from TomSweeneyRedHat/bump-1.25.1

Bump 1.25.1 Signed-off-by: Daniel J Walsh <[email protected]>
containers · Mar 30, 2022 · 495fba8 · 495fba8
2 parents aaa8cfd + faebb9f
commit 495fba8
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 # Changelog
 
+## v1.25.1 (2022-03-30)
+
+    buildah: create WORKDIR with USER permissions
+    vendor: update github.com/openshift/imagebuilder
+    copier: attempt to open the dir before adding it
+    Updated dependabot to get updates for GitHub actions.
+    Switch most calls to filepath.Walk to filepath.WalkDir
+    build: allow --no-cache and --layers so build cache can be overrided
+    build(deps): bump github.com/onsi/gomega from 1.18.1 to 1.19.0
+    Bump to v1.26.0-dev
+    build(deps): bump github.com/golangci/golangci-lint in /tests/tools
+
 ## v1.25.0 (2022-03-25)
 
     install: drop RHEL/CentOS 7 doc

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,14 @@
+- Changelog for v1.25.1 (2022-03-30)
+  * buildah: create WORKDIR with USER permissions
+  * vendor: update github.com/openshift/imagebuilder
+  * copier: attempt to open the dir before adding it
+  * Updated dependabot to get updates for GitHub actions.
+  * Switch most calls to filepath.Walk to filepath.WalkDir
+  * build: allow --no-cache and --layers so build cache can be overrided
+  * build(deps): bump github.com/onsi/gomega from 1.18.1 to 1.19.0
+  * Bump to v1.26.0-dev
+  * build(deps): bump github.com/golangci/golangci-lint in /tests/tools
+
 - Changelog for v1.25.0 (2022-03-25)
   * install: drop RHEL/CentOS 7 doc
   * build(deps): bump github.com/containers/common from 0.47.4 to 0.47.5

diff --git a/contrib/rpm/buildah.spec b/contrib/rpm/buildah.spec
@@ -100,7 +100,18 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 %{_datadir}/bash-completion/completions/*
 
 %changelog
-* Fri Mar 25, 2022 Tom Sweeney <[email protected]> 1.26.0-dev-1
+* Wed Mar 30, 2022 Tom Sweeney <[email protected]> 1.26.0-dev-1
+
+* Wed Mar 30, 2022 Tom Sweeney <[email protected]> 1.25.1-1
+- buildah: create WORKDIR with USER permissions
+- vendor: update github.com/openshift/imagebuilder
+- copier: attempt to open the dir before adding it
+- Updated dependabot to get updates for GitHub actions.
+- Switch most calls to filepath.Walk to filepath.WalkDir
+- build: allow --no-cache and --layers so build cache can be overrided
+- build(deps): bump github.com/onsi/gomega from 1.18.1 to 1.19.0
+- Bump to v1.26.0-dev
+- build(deps): bump github.com/golangci/golangci-lint in /tests/tools
 
 * Fri Mar 25, 2022 Tom Sweeney <[email protected]> 1.25.0-1
 - install: drop RHEL/CentOS 7 doc

diff --git a/go.mod b/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/opencontainers/runc v1.1.0
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
 	github.com/opencontainers/runtime-tools v0.9.0
-	github.com/opencontainers/selinux v1.10.0
+	github.com/opencontainers/selinux v1.10.1
 	github.com/openshift/imagebuilder v1.2.3
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.1 // indirect

diff --git a/go.sum b/go.sum
@@ -876,8 +876,9 @@ github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqi
 github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
 github.com/opencontainers/selinux v1.8.5/go.mod h1:HTvjPFoGMbpQsG886e3lQwnsRWtE4TC1OF3OUvG9FAo=
-github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU=
 github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
+github.com/opencontainers/selinux v1.10.1 h1:09LIPVRP3uuZGQvgR+SgMSNBd1Eb3vlRbGqQpoHsF8w=
+github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
 github.com/openshift/imagebuilder v1.2.3 h1:jvA7mESJdclRKkTe3Yl6UWlliFNVW6mLY8RI+Rrfhfo=
 github.com/openshift/imagebuilder v1.2.3/go.mod h1:TRYHe4CH9U6nkDjxjBNM5klrLbJBrRbpJE5SaRwUBsQ=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

diff --git a/selinux.go b/selinux.go
@@ -1,9 +1,11 @@
+//go:build linux
 // +build linux
 
 package buildah
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/opencontainers/runtime-tools/generate"
 	selinux "github.com/opencontainers/selinux/go-selinux"
@@ -33,6 +35,9 @@ func runLabelStdioPipes(stdioPipe [][]int, processLabel, mountLabel string) erro
 	}
 	for i := range stdioPipe {
 		pipeFdName := fmt.Sprintf("/proc/self/fd/%d", stdioPipe[i][0])
+		if linkfile, err := os.Readlink(pipeFdName); err == nil {
+			pipeFdName = linkfile
+		}
 		if err := label.Relabel(pipeFdName, pipeContext, false); err != nil {
 			return errors.Wrapf(err, "setting file label on %q", pipeFdName)
 		}

diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/rchcon.go b/vendor/github.com/opencontainers/selinux/go-selinux/rchcon.go
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/rchcon_go115.go b/vendor/github.com/opencontainers/selinux/go-selinux/rchcon_go115.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -415,7 +415,7 @@ github.com/opencontainers/runtime-tools/generate
 github.com/opencontainers/runtime-tools/generate/seccomp
 github.com/opencontainers/runtime-tools/specerror
 github.com/opencontainers/runtime-tools/validate
-# github.com/opencontainers/selinux v1.10.0
+# github.com/opencontainers/selinux v1.10.1
 github.com/opencontainers/selinux/go-selinux
 github.com/opencontainers/selinux/go-selinux/label
 github.com/opencontainers/selinux/pkg/pwalk