diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-08-04 07:38:22 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-08-04 08:59:19 -0400 |
| commit | f40a0e7c8138dbfe9f924e51aacef070efb15162 (patch) | |
| tree | d72c32a4f1fcc87d48ca5752019055a568f22e47 /libpod | |
| parent | 3a922cbc99f49b996c0379a9ec90ccc47a325018 (diff) | |
| download | podman-f40a0e7c8138dbfe9f924e51aacef070efb15162.tar.gz podman-f40a0e7c8138dbfe9f924e51aacef070efb15162.tar.bz2 podman-f40a0e7c8138dbfe9f924e51aacef070efb15162.zip | |
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>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime_ctr.go | 4 |
1 files changed, 4 insertions, 0 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 |