diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-04 18:47:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 18:47:18 +0000 |
| commit | c887018571ac6dc7c3eeb1d039685d4606850311 (patch) | |
| tree | 20e1af0ad47f8846dde65e168159d3a5b46d1529 | |
| parent | 9c2fc4b6228889ea850656468381a8be45f7e3cd (diff) | |
| parent | f40a0e7c8138dbfe9f924e51aacef070efb15162 (diff) | |
| download | podman-c887018571ac6dc7c3eeb1d039685d4606850311.tar.gz podman-c887018571ac6dc7c3eeb1d039685d4606850311.tar.bz2 podman-c887018571ac6dc7c3eeb1d039685d4606850311.zip | |
Merge pull request #11128 from rhatdan/timezone
Handle timezone on server containers.conf
| -rw-r--r-- | libpod/runtime_ctr.go | 4 | ||||
| -rw-r--r-- | test/e2e/containers_conf_test.go | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 31e2d09ce..059f56798 100644 --- 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 index 3349b8be3..08fc4e6cc 100644 --- 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() { |