summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2018-08-08 16:08:25 (GMT)
committerChristian Pointner <equinox@helsinki.at>2018-08-08 16:08:25 (GMT)
commitd6f0f61b51c943c664cdf774e8f1d504e76722bd (patch)
tree8f64ad7a58c325953f22e30cdf8e0ddf690e0a4b
parent04f828f50f305a4843837dccde6549289a14fc30 (diff)
generate locales in os images
-rw-r--r--debian/stretch/Dockerfile4
-rw-r--r--ubuntu/bionic/Dockerfile4
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/stretch/Dockerfile b/debian/stretch/Dockerfile
index 36b7039..f14271e 100644
--- a/debian/stretch/Dockerfile
+++ b/debian/stretch/Dockerfile
@@ -9,7 +9,7 @@ RUN set -x \
&& echo 'deb http://apt.helsinki.at/debian-security/ stretch/updates main' >>/etc/apt/sources.list \
&& echo 'APT::Install-Recommends "false";' >/etc/apt/apt.conf.d/02-norecommends \
&& apt-get update -q \
- && apt-get install -y -q tzdata gnupg2 \
+ && apt-get install -y -q tzdata gnupg2 locales \
&& apt-get upgrade -y -q \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -21,6 +21,8 @@ RUN set -x \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
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
diff --git a/ubuntu/bionic/Dockerfile b/ubuntu/bionic/Dockerfile
index 4f4c027..1cf9ff6 100644
--- a/ubuntu/bionic/Dockerfile
+++ b/ubuntu/bionic/Dockerfile
@@ -9,7 +9,7 @@ RUN set -x \
&& echo 'deb http://apt.helsinki.at/ubuntu-security/ bionic-security main universe' >>/etc/apt/sources.list \
&& echo 'APT::Install-Recommends "false";' >/etc/apt/apt.conf.d/02-norecommends \
&& apt-get update -q \
- && apt-get install -y -q tzdata gnupg2 \
+ && apt-get install -y -q tzdata gnupg2 locales \
&& apt-get upgrade -y -q \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -21,6 +21,8 @@ RUN set -x \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
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