summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2019-12-09 09:39:56 (GMT)
committerChristian Pointner <equinox@helsinki.at>2019-12-09 09:39:56 (GMT)
commit597c552e516a848b5393256c625bb638f97cc304 (patch)
treee667cbcf4838fe332cd94491b6f021e81abc6913
parentd6f0f61b51c943c664cdf774e8f1d504e76722bd (diff)
generic timezone setting
-rw-r--r--debian/stretch/Dockerfile5
-rw-r--r--ubuntu/bionic/Dockerfile5
2 files changed, 6 insertions, 4 deletions
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/