Add missing user-facing part to allow volume subpath mounts #22040
Cirrus CI / Build for debian-13
failed
Mar 16, 2024 in 6m 50s
Task Summary
Instruction postbuild failed in 00:18
Details
✅ 00:21 clone
✅ 00:10 prebuild
✅ 00:05 setup
✅ 05:52 main
❌ 00:18 postbuild
$SCRIPT_BASE/postbuild.sh
+ make .install.goimports # ./contrib/cirrus/postbuild.sh:33 in main()
make -C test/tools build/goimports
make[1]: Entering directory '/var/tmp/go/src/github.com/containers/podman/test/tools'
go build -o build/goimports ./vendor/golang.org/x/tools/cmd/goimports
make[1]: Leaving directory '/var/tmp/go/src/github.com/containers/podman/test/tools'
+ make vendor # ./contrib/cirrus/postbuild.sh:34 in main()
go mod tidy
go mod vendor
go mod verify
all modules verified
tree is dirty, please run 'make vendor' and commit all changes
M vendor/github.com/containers/common/pkg/parse/parse.go
---------------------- Diff below ----------------------
diff --git a/vendor/github.com/containers/common/pkg/parse/parse.go b/vendor/github.com/containers/common/pkg/parse/parse.go
index 0c04c9d24..284751e52 100644
--- a/vendor/github.com/containers/common/pkg/parse/parse.go
+++ b/vendor/github.com/containers/common/pkg/parse/parse.go
@@ -14,7 +14,7 @@ import (
// ValidateVolumeOpts validates a volume's options
func ValidateVolumeOpts(options []string) ([]string, error) {
- var foundRootPropagation, foundRWRO, foundLabelChange, bindType, foundExec, foundDev, foundSuid, foundChown, foundUpperDir, foundWorkDir, foundCopy, foundCopySymlink, foundVolumeSubpath int
+ var foundRootPropagation, foundRWRO, foundLabelChange, bindType, foundExec, foundDev, foundSuid, foundChown, foundUpperDir, foundWorkDir, foundCopy, foundCopySymlink int
finalOpts := make([]string, 0, len(options))
for _, opt := range options {
// support advanced options like upperdir=/path, workdir=/path
@@ -38,14 +38,6 @@ func ValidateVolumeOpts(options []string) ([]string, error) {
finalOpts = append(finalOpts, opt)
continue
}
- if strings.HasPrefix(opt, "subpath") {
- foundVolumeSubpath++
- if foundVolumeSubpath > 1 {
- return nil, fmt.Errorf("invalid options %q, can only specify 1 subpath per mount", strings.Join(options, ", "))
- }
- finalOpts = append(finalOpts, opt)
- continue
- }
switch opt {
case "noexec", "exec":
Loading