Handle timezone on server containers.conf

Fixes: containers#11124 Signed-off-by: Daniel J Walsh <[email protected]> Signed-off-by: Daniel J Walsh <[email protected]> Signed-off-by: Daniel J Walsh <[email protected]>
mheon · Aug 11, 2021 · 85d5c24 · 85d5c24
1 parent 67bf11e
commit 85d5c24
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
@@ -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 {
 		// Remove information about bind mount
 		// for new container from imported checkpoint

diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
@@ -261,10 +261,16 @@ var _ = Describe("Podman run", func() {
 
 	It("podman run containers.conf timezone", func() {
 		//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()
 		Expect(session).Should(Exit(0))
 		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() {