From 17277ef3f4ad6f43b0a32af73b3ab5e448248a89 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Wed, 11 Dec 2019 17:19:33 +0100
Subject: added buster image and cleanup repo handling


diff --git a/build-os-images.sh b/build-os-images.sh
index a148081..cc5d4e1 100755
--- a/build-os-images.sh
+++ b/build-os-images.sh
@@ -34,7 +34,7 @@ function run_build {
 }
 
 ## debian
-for codename in stretch; do
+for codename in stretch buster; do
   run_build "debian:$codename" "debian/$codename"
 done
 
diff --git a/common/bin/tini b/common/bin/tini
index 03af82f..8947338 100755
Binary files a/common/bin/tini and b/common/bin/tini differ
diff --git a/common/helsinki_repo.gpg b/common/helsinki_repo.gpg
new file mode 100644
index 0000000..204715b
Binary files /dev/null and b/common/helsinki_repo.gpg differ
diff --git a/common/helsinki_repo.pub b/common/helsinki_repo.pub
deleted file mode 100644
index 5952c40..0000000
--- a/common/helsinki_repo.pub
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-u9vVOq/VZDZaU58M7BnA2LM4Yls=
-=rM3X
------END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/buster/Dockerfile b/debian/buster/Dockerfile
new file mode 100644
index 0000000..31c6aa9
--- /dev/null
+++ b/debian/buster/Dockerfile
@@ -0,0 +1,31 @@
+FROM debian:buster
+MAINTAINER Christian Pointner <equinox@helsinki.at>
+
+LABEL at.helsinki.docker.os.distro=debian at.helsinki.docker.os.release=buster
+
+RUN set -x \
+    && echo 'deb http://apt.helsinki.at/debian buster main' > /etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/debian buster-updates main' >> /etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/security buster/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 locales \
+    && apt-get upgrade -y -q \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY common/helsinki_repo.gpg /etc/apt/trusted.gpg.d/helsinki.gpg
+RUN set -x \
+    && echo 'deb http://build.helsinki.at buster main' >>/etc/apt/sources.list.d/helsinki.list \
+    && 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 \
+    && ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
+    && echo ${TZ} > /etc/timezone
+
+COPY common/bin/tini /usr/local/bin/
+
+ENTRYPOINT ["tini", "--"]
diff --git a/debian/stretch/Dockerfile b/debian/stretch/Dockerfile
index 42ceca5..96640ee 100644
--- a/debian/stretch/Dockerfile
+++ b/debian/stretch/Dockerfile
@@ -4,19 +4,18 @@ MAINTAINER Christian Pointner <equinox@helsinki.at>
 LABEL at.helsinki.docker.os.distro=debian at.helsinki.docker.os.release=stretch
 
 RUN set -x \
-    && echo 'deb http://apt.helsinki.at/debian/ stretch main' > /etc/apt/sources.list \
-    && echo 'deb http://apt.helsinki.at/debian/ stretch-updates main' >> /etc/apt/sources.list \
-    && echo 'deb http://apt.helsinki.at/debian-security/ stretch/updates main' >>/etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/debian stretch main' > /etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/debian stretch-updates main' >> /etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/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 locales \
+    && apt-get install -y -q tzdata locales \
     && apt-get upgrade -y -q \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-COPY common/helsinki_repo.pub /tmp
+COPY common/helsinki_repo.gpg /etc/apt/trusted.gpg.d/helsinki.gpg
 RUN set -x \
-    && echo 'deb http://build.helsinki.at/ stretch main' >>/etc/apt/sources.list.d/helsinki.list \
-    && apt-key add /tmp/helsinki_repo.pub \
+    && echo 'deb http://build.helsinki.at stretch main' >>/etc/apt/sources.list.d/helsinki.list \
     && apt-get update -q \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
diff --git a/ubuntu/bionic/Dockerfile b/ubuntu/bionic/Dockerfile
index d5f8591..2877310 100644
--- a/ubuntu/bionic/Dockerfile
+++ b/ubuntu/bionic/Dockerfile
@@ -4,19 +4,18 @@ MAINTAINER Christian Pointner <equinox@helsinki.at>
 LABEL at.helsinki.docker.os.distro=ubuntu at.helsinki.docker.os.release=bionic
 
 RUN set -x \
-    && echo 'deb http://apt.helsinki.at/ubuntu/ bionic main universe' > /etc/apt/sources.list \
-    && echo 'deb http://apt.helsinki.at/ubuntu/ bionic-updates main universe' >> /etc/apt/sources.list \
-    && echo 'deb http://apt.helsinki.at/ubuntu-security/ bionic-security main universe' >>/etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/ubuntu bionic main universe' > /etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/ubuntu bionic-updates main universe' >> /etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/ubuntu 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 locales \
+    && apt-get install -y -q tzdata locales \
     && apt-get upgrade -y -q \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-COPY common/helsinki_repo.pub /tmp
+COPY common/helsinki_repo.gpg /etc/apt/trusted.gpg.d/helsinki.gpg
 RUN set -x \
-    && echo 'deb http://build.helsinki.at/ bionic main' >>/etc/apt/sources.list.d/helsinki.list \
-    && apt-key add /tmp/helsinki_repo.pub \
+    && echo 'deb http://build.helsinki.at bionic main' >>/etc/apt/sources.list.d/helsinki.list \
     && apt-get update -q \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-- 
cgit v0.10.2