From 5c59be747cb999545e3c7a16ad135bcbec679b22 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 8 Feb 2023 14:01:45 +0100
Subject: debian: add bullseye and remove stretch


diff --git a/build-os-images.sh b/build-os-images.sh
index cc5d4e1..12c6b72 100755
--- a/build-os-images.sh
+++ b/build-os-images.sh
@@ -34,7 +34,7 @@ function run_build {
 }
 
 ## debian
-for codename in stretch buster; do
+for codename in buster bullseye; do
   run_build "debian:$codename" "debian/$codename"
 done
 
diff --git a/debian/bullseye/Dockerfile b/debian/bullseye/Dockerfile
new file mode 100644
index 0000000..d2ac56c
--- /dev/null
+++ b/debian/bullseye/Dockerfile
@@ -0,0 +1,31 @@
+FROM debian:bullseye
+MAINTAINER Christian Pointner <equinox@helsinki.at>
+
+LABEL at.helsinki.docker.os.distro=debian at.helsinki.docker.os.release=bullseye
+
+RUN set -x \
+    && echo 'deb http://apt.helsinki.at/debian bullseye main' > /etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/debian bullseye-updates main' >> /etc/apt/sources.list \
+    && echo 'deb http://apt.helsinki.at/security bullseye-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 bullseye 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
deleted file mode 100644
index 96640ee..0000000
--- a/debian/stretch/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM debian:stretch
-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/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 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 stretch 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", "--"]
-- 
cgit v0.10.2