containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle timezone on server containers.conf 

Fixes: https://github.com/containers/podman/issues/11124

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@localhost.localdomain>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2021-08-04 07:38:22 -04:00
parent 3a922cbc99
commit f40a0e7c81
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/runtime_ctr.go
View File

@ -353,6 +353,10 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai
} }
} }
if ctr.config.Timezone == "" {
ctr.config.Timezone = r.config.Containers.TZ
}
if ctr.restoreFromCheckpoint { if ctr.restoreFromCheckpoint {
// Remove information about bind mount // Remove information about bind mount
// for new container from imported checkpoint // for new container from imported checkpoint

8
test/e2e/containers_conf_test.go
View File

@ -261,10 +261,16 @@ var _ = Describe("Podman run", func() {
It("podman run containers.conf timezone", func() { It("podman run containers.conf timezone", func() {
//containers.conf timezone set to Pacific/Honolulu //containers.conf timezone set to Pacific/Honolulu
session := podmanTest.Podman([]string{"run", ALPINE, "date", "+'%H %Z'"}) session := podmanTest.Podman([]string{"run", "--tz", "", ALPINE, "date", "+'%H %Z'"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring("HST")) Expect(session.OutputToString()).To(ContainSubstring("HST"))
// verify flag still overrides
session = podmanTest.Podman([]string{"run", "--tz", "EST", ALPINE, "date", "+'%H %Z'"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring("EST"))
}) })
It("podman run containers.conf umask", func() { It("podman run containers.conf umask", func() {