diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-06 13:28:20 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-06 13:28:20 -0400 |
commit | 9532509c50113ac9470108e3492e2769bac533e8 (patch) | |
tree | 4d691205d2c574b6c7ab6eb3c62937b327898f58 /libpod/container.go | |
parent | 9eac75a967e3459b32b1acd220afb49b60f5e5aa (diff) | |
parent | 9a1543caec75a7b02dd2ec9a1111756bb1716454 (diff) | |
download | podman-9532509c50113ac9470108e3492e2769bac533e8.tar.gz podman-9532509c50113ac9470108e3492e2769bac533e8.tar.bz2 podman-9532509c50113ac9470108e3492e2769bac533e8.zip |
Merge pull request #6836 from ashley-cui/tzlibpod
Add --tz flag to create, run
Diffstat (limited to 'libpod/container.go')
-rw-r--r-- | libpod/container.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libpod/container.go b/libpod/container.go index 66e444c51..a71692dd8 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -424,6 +424,10 @@ type ContainerConfig struct { // to 0, 1, 2) that will be passed to the executed process. The total FDs // passed will be 3 + PreserveFDs. PreserveFDs uint `json:"preserveFds,omitempty"` + + // Timezone is the timezone inside the container. + // Local means it has the same timezone as the host machine + Timezone string `json:"timezone,omitempty"` } // ContainerNamedVolume is a named volume that will be mounted into the @@ -1248,3 +1252,8 @@ func (c *Container) AutoRemove() bool { } return c.Spec().Annotations[define.InspectAnnotationAutoremove] == define.InspectResponseTrue } + +func (c *Container) Timezone() string { + return c.config.Timezone + +} |