diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-02-09 08:25:59 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-02-09 13:18:18 -0500 |
| commit | cc846a8cd901705316e2b06013beb5c6bde44bfc (patch) | |
| tree | d976fb2f804c4a5b4459e571b734d0fcaaa2002d /test/e2e | |
| parent | 763d522983b819ecd38689c9c0840069d1e2b530 (diff) | |
| download | podman-cc846a8cd901705316e2b06013beb5c6bde44bfc.tar.gz podman-cc846a8cd901705316e2b06013beb5c6bde44bfc.tar.bz2 podman-cc846a8cd901705316e2b06013beb5c6bde44bfc.zip | |
Support annotations from containers.conf
Currently podman does not use the annotations specified in the
containers.conf. This PR fixes this.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/config/containers.conf | 2 | ||||
| -rw-r--r-- | test/e2e/containers_conf_test.go | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/test/e2e/config/containers.conf b/test/e2e/config/containers.conf index 5a5e4b7a5..fdf679664 100644 --- a/test/e2e/config/containers.conf +++ b/test/e2e/config/containers.conf @@ -53,6 +53,8 @@ tz = "Pacific/Honolulu" umask = "0002" +annotations=["run.oci.keep_original_groups=1",] + [engine] network_cmd_options=["allow_host_loopback=true"] diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 719ac9fac..c78c93b8c 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -320,4 +320,15 @@ var _ = Describe("Podman run", func() { 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")) + }) + }) |