From f40a0e7c8138dbfe9f924e51aacef070efb15162 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 4 Aug 2021 07:38:22 -0400 Subject: Handle timezone on server containers.conf Fixes: https://github.com/containers/podman/issues/11124 Signed-off-by: Daniel J Walsh Signed-off-by: Daniel J Walsh Signed-off-by: Daniel J Walsh --- libpod/runtime_ctr.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libpod/runtime_ctr.go') 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 -- cgit v1.2.3-54-g00ecf