opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-18 11:42:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9284 from rhatdan/annotations

Browse Source 
Support annotations from containers.conf
This commit is contained in:
OpenShift Merge Robot
2021-02-09 18:40:36 -05:00
committed by GitHub
parent 8600c3b8e2 46385dd609
commit 2d829aeb1f
4 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/specgen/generate/container.go
View File

@ -3,6 +3,7 @@ package generate
import ( import (
"context" "context"
"os" "os"
"strings"
"github.com/containers/image/v5/manifest" "github.com/containers/image/v5/manifest"
"github.com/containers/podman/v2/libpod" "github.com/containers/podman/v2/libpod"
@ -197,6 +198,15 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
annotations[ann.ContainerType] = ann.ContainerTypeContainer annotations[ann.ContainerType] = ann.ContainerTypeContainer
} }
for _, v := range rtc.Containers.Annotations {
split := strings.SplitN(v, "=", 2)
k := split[0]
v := ""
if len(split) == 2 {
v = split[1]
}
annotations[k] = v
}
// now pass in the values from client // now pass in the values from client
for k, v := range s.Annotations { for k, v := range s.Annotations {
annotations[k] = v annotations[k] = v

2
test/e2e/config/containers.conf
View File

@ -53,6 +53,8 @@ tz = "Pacific/Honolulu"
umask = "0002" umask = "0002"
annotations=["run.oci.keep_original_groups=1",]
[engine] [engine]
network_cmd_options=["allow_host_loopback=true"] network_cmd_options=["allow_host_loopback=true"]

11
test/e2e/containers_conf_test.go
View File

@ -320,4 +320,15 @@ var _ = Describe("Podman run", func() {
Expect(session.OutputToString()).To(Equal("0022")) Expect(session.OutputToString()).To(Equal("0022"))
}) })
It("podman run containers.conf annotations test", func() {
//containers.conf is set to "run.oci.keep_original_groups=1"
session := podmanTest.Podman([]string{"create", "--rm", "--name", "test", fedoraMinimal})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
inspect := podmanTest.Podman([]string{"inspect", "--format", "{{ .Config.Annotations }}", "test"})
inspect.WaitWithDefaultTimeout()
Expect(inspect.OutputToString()).To(ContainSubstring("run.oci.keep_original_groups:1"))
})
}) })

6
test/e2e/run_test.go
View File

@ -332,6 +332,9 @@ var _ = Describe("Podman run", func() {
It("podman run user capabilities test", func() { It("podman run user capabilities test", func() {
// We need to ignore the containers.conf on the test distribution for this test // We need to ignore the containers.conf on the test distribution for this test
os.Setenv("CONTAINERS_CONF", "/dev/null") os.Setenv("CONTAINERS_CONF", "/dev/null")
if IsRemote() {
podmanTest.RestartRemoteService()
}
session := podmanTest.Podman([]string{"run", "--rm", "--user", "bin", ALPINE, "grep", "CapBnd", "/proc/self/status"}) session := podmanTest.Podman([]string{"run", "--rm", "--user", "bin", ALPINE, "grep", "CapBnd", "/proc/self/status"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -424,6 +427,9 @@ var _ = Describe("Podman run", func() {
It("podman run user capabilities test with image", func() { It("podman run user capabilities test with image", func() {
// We need to ignore the containers.conf on the test distribution for this test // We need to ignore the containers.conf on the test distribution for this test
os.Setenv("CONTAINERS_CONF", "/dev/null") os.Setenv("CONTAINERS_CONF", "/dev/null")
if IsRemote() {
podmanTest.RestartRemoteService()
}
dockerfile := `FROM busybox dockerfile := `FROM busybox
USER bin` USER bin`
podmanTest.BuildImage(dockerfile, "test", "false") podmanTest.BuildImage(dockerfile, "test", "false")