From 597c552e516a848b5393256c625bb638f97cc304 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 9 Dec 2019 10:39:56 +0100 Subject: generic timezone setting diff --git a/debian/stretch/Dockerfile b/debian/stretch/Dockerfile index f14271e..42ceca5 100644 --- a/debian/stretch/Dockerfile +++ b/debian/stretch/Dockerfile @@ -20,11 +20,12 @@ RUN set -x \ && apt-get update -q \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +ENV TZ="Europe/Vienna" RUN set -x \ && echo "de_AT.UTF-8 UTF-8\nen_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && echo "Europe/Vienna" > /etc/timezone \ - && dpkg-reconfigure -f noninteractive tzdata + && ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \ + && echo ${TZ} > /etc/timezone COPY common/bin/tini /usr/local/bin/ diff --git a/ubuntu/bionic/Dockerfile b/ubuntu/bionic/Dockerfile index 1cf9ff6..d5f8591 100644 --- a/ubuntu/bionic/Dockerfile +++ b/ubuntu/bionic/Dockerfile @@ -20,11 +20,12 @@ RUN set -x \ && apt-get update -q \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +ENV TZ="Europe/Vienna" RUN set -x \ && echo "de_AT.UTF-8 UTF-8\nen_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && echo "Europe/Vienna" > /etc/timezone \ - && dpkg-reconfigure -f noninteractive tzdata + && ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \ + && echo ${TZ} > /etc/timezone COPY common/bin/tini /usr/local/bin/ -- cgit v0.10.2