diff options
| author | Ashley Cui <acui@redhat.com> | 2020-06-30 17:21:52 -0400 |
|---|---|---|
| committer | Ashley Cui <acui@redhat.com> | 2020-07-02 13:30:59 -0400 |
| commit | 9a1543caec75a7b02dd2ec9a1111756bb1716454 (patch) | |
| tree | fb1223410fe7ce9e0831a39c73a70bd9efa0caee /cmd/podman/common | |
| parent | e84695213e35c22ba085e3831cbd025cd55a4c84 (diff) | |
| download | podman-9a1543caec75a7b02dd2ec9a1111756bb1716454.tar.gz podman-9a1543caec75a7b02dd2ec9a1111756bb1716454.tar.bz2 podman-9a1543caec75a7b02dd2ec9a1111756bb1716454.zip | |
Add --tz flag to create, run
--tz flag sets timezone inside container
Can be set to IANA timezone as well as `local` to match host machine
Signed-off-by: Ashley Cui <acui@redhat.com>
Diffstat (limited to 'cmd/podman/common')
| -rw-r--r-- | cmd/podman/common/create.go | 5 | ||||
| -rw-r--r-- | cmd/podman/common/create_opts.go | 1 | ||||
| -rw-r--r-- | cmd/podman/common/specgen.go | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index ec3251ae1..0534fd582 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -449,6 +449,11 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "tty", "t", false, "Allocate a pseudo-TTY for container", ) + createFlags.StringVar( + &cf.Timezone, + "tz", containerConfig.TZ(), + "Set timezone in container", + ) createFlags.StringSliceVar( &cf.UIDMap, "uidmap", []string{}, diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 4f3b8b322..6f45e24e9 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -91,6 +91,7 @@ type ContainerCLIOpts struct { Systemd string TmpFS []string TTY bool + Timezone string UIDMap []string Ulimit []string User string diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 1f6fbbe98..273fcc589 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -619,6 +619,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string } s.Remove = c.Rm s.StopTimeout = &c.StopTimeout + s.Timezone = c.Timezone return nil } |