container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-21 01:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11912 from chenk008/fix_roofs_path_contains_colon

Browse source 
support rootfs contains colon
This commit is contained in:
OpenShift Merge Robot 2021-10-11 19:52:13 +02:00 committed by GitHub
parent dd9c9172af 54471acba8
commit 00ebf3cf18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/specgen/specgen.go
View file

@ -552,10 +552,10 @@ func NewSpecGenerator(arg string, rootfs bool) *SpecGenerator {
if rootfs {
csc.Rootfs = arg
// check if rootfs is actually overlayed
parts := strings.SplitN(csc.Rootfs, ":", 2)
if len(parts) > 1 && parts[1] == "O" {
lastColonIndex := strings.LastIndex(csc.Rootfs, ":")
if lastColonIndex != -1 && lastColonIndex+1 < len(csc.Rootfs) && csc.Rootfs[lastColonIndex+1:] == "O" {
csc.RootfsOverlay = true
csc.Rootfs = parts[0]
csc.Rootfs = csc.Rootfs[:lastColonIndex]
}
} else {
csc.Image = arg

25
pkg/specgen/specgen_test.go Normal file
View file

@ -0,0 +1,25 @@
package specgen
import (
"testing"
"github.com/stretchr/testify/assert"
)
func TestNewSpecGeneratorWithRootfs(t *testing.T) {
tests := []struct {
rootfs string
expectedRootfsOverlay bool
expectedRootfs string
}{
{"/root/a:b:O", true, "/root/a:b"},
{"/root/a:b/c:O", true, "/root/a:b/c"},
{"/root/a:b/c:", false, "/root/a:b/c:"},
{"/root/a/b", false, "/root/a/b"},
}
for _, args := range tests {
val := NewSpecGenerator(args.rootfs, true)
assert.Equal(t, val.RootfsOverlay, args.expectedRootfsOverlay)
assert.Equal(t, val.Rootfs, args.expectedRootfs)
}
}