diff options
| -rw-r--r-- | pkg/spec/spec.go | 3 | ||||
| -rw-r--r-- | test/system/055-rm.bats | 2 | ||||
| -rw-r--r-- | test/system/065-cp.bats | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 38f9c7306..c7aa003e8 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -387,6 +387,9 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM if err != nil { return nil, err } + if !addedResources { + configSpec.Linux.Resources = &spec.LinuxResources{} + } if addedResources && !cgroup2 { return nil, errors.New("invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode") } diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats index c13c8c52e..8ef8a119e 100644 --- a/test/system/055-rm.bats +++ b/test/system/055-rm.bats @@ -32,8 +32,6 @@ load helpers # # See https://github.com/containers/libpod/issues/3795 @test "podman rm -f" { - skip_if_remote "podman-remote does not handle exit codes" - rand=$(random_string 30) ( sleep 3; run_podman rm -f $rand ) & run_podman 137 run --name $rand $IMAGE sleep 30 diff --git a/test/system/065-cp.bats b/test/system/065-cp.bats index 38660a13c..0701055f9 100644 --- a/test/system/065-cp.bats +++ b/test/system/065-cp.bats @@ -38,7 +38,6 @@ load helpers # into host-only space. Try to podman-cp that symlink. It should fail. @test "podman cp - will not recognize symlink pointing into host space" { skip_if_remote "podman-remote does not yet handle cp" - skip "BROKEN: PLEASE ENABLE ONCE #3829 GETS FIXED" srcdir=$PODMAN_TMPDIR/cp-test-in dstdir=$PODMAN_TMPDIR/cp-test-out @@ -69,7 +68,6 @@ load helpers # this invalid double symlink. It must fail. @test "podman cp - will not expand globs in host space (#3829)" { skip_if_remote "podman-remote does not yet handle cp" - skip "BROKEN: PLEASE ENABLE ONCE #3829 GETS FIXED" srcdir=$PODMAN_TMPDIR/cp-test-in dstdir=$PODMAN_TMPDIR/cp-test-out |