From 9ee470f9556462dd3fda656d58358e7ae78f4d47 Mon Sep 17 00:00:00 2001 From: Philipp Sauter Date: Wed, 26 Jan 2022 05:37:49 +0100 Subject: [PATCH] feat: set /etc/localtime to UTC Adds a timezone file for UTC to the rootfs and create a symlink for it at /etc/localtime Fixes #4840 Signed-off-by: Philipp Sauter Signed-off-by: Andrey Smirnov --- Dockerfile | 8 ++++++-- hack/zoneinfo/Etc/UTC | Bin 0 -> 114 bytes 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 hack/zoneinfo/Etc/UTC diff --git a/Dockerfile b/Dockerfile index 0748c3a53..d7c871cab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -376,7 +376,9 @@ COPY --from=machined-build-amd64 /machined /rootfs/sbin/init # symlinks to avoid accidentally cleaning them up. COPY ./hack/cleanup.sh /toolchain/bin/cleanup.sh RUN cleanup.sh /rootfs -RUN mkdir -pv /rootfs/{boot,etc/cri/conf.d/hosts,lib/firmware,usr/local/share,mnt,system,opt} +RUN mkdir -pv /rootfs/{boot,etc/cri/conf.d/hosts,lib/firmware,usr/local/share,usr/share/zoneinfo/Etc,mnt,system,opt} +COPY --chmod=0644 hack/zoneinfo/Etc/UTC /rootfs/usr/share/zoneinfo/Etc/UTC +RUN ln -s /usr/share/zoneinfo/Etc/UTC /rootfs/etc/localtime RUN mkdir -pv /rootfs/{etc/kubernetes/manifests,etc/cni/net.d,usr/libexec/kubernetes} RUN mkdir -pv /rootfs/opt/{containerd/bin,containerd/lib} COPY --chmod=0644 hack/containerd.toml /rootfs/etc/containerd/config.toml @@ -417,7 +419,9 @@ COPY --from=machined-build-arm64 /machined /rootfs/sbin/init # symlinks to avoid accidentally cleaning them up. COPY ./hack/cleanup.sh /toolchain/bin/cleanup.sh RUN cleanup.sh /rootfs -RUN mkdir -pv /rootfs/{boot,etc/cri/conf.d/hosts,lib/firmware,usr/local/share,mnt,system,opt} +RUN mkdir -pv /rootfs/{boot,etc/cri/conf.d/hosts,lib/firmware,usr/local/share,usr/share/zoneinfo/Etc,mnt,system,opt} +COPY --chmod=0644 hack/zoneinfo/Etc/UTC /rootfs/usr/share/zoneinfo/Etc/UTC +RUN ln -s /usr/share/zoneinfo/Etc/UTC /rootfs/etc/localtime RUN mkdir -pv /rootfs/{etc/kubernetes/manifests,etc/cni/net.d,usr/libexec/kubernetes} RUN mkdir -pv /rootfs/opt/{containerd/bin,containerd/lib} COPY --chmod=0644 hack/containerd.toml /rootfs/etc/containerd/config.toml diff --git a/hack/zoneinfo/Etc/UTC b/hack/zoneinfo/Etc/UTC new file mode 100644 index 0000000000000000000000000000000000000000..91558be0c2bf903b2364215ba26d5227d6126508 GIT binary patch literal 114 hcmWHE%1kq2AP5+NDp(+@LPMMxLdep^1=MQ51psH$25|rY literal 0 HcmV?d00001