summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2023-02-08 13:01:45 (GMT)
committerChristian Pointner <equinox@spreadspace.org>2023-02-08 13:01:45 (GMT)
commit5c59be747cb999545e3c7a16ad135bcbec679b22 (patch)
tree697e958fa391159a8787efc4b7514924c2e1e3ac
parent17277ef3f4ad6f43b0a32af73b3ab5e448248a89 (diff)
debian: add bullseye and remove stretch
-rwxr-xr-xbuild-os-images.sh2
-rw-r--r--debian/bullseye/Dockerfile (renamed from debian/stretch/Dockerfile)12
2 files changed, 7 insertions, 7 deletions
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/stretch/Dockerfile b/debian/bullseye/Dockerfile
index 96640ee..d2ac56c 100644
--- a/debian/stretch/Dockerfile
+++ b/debian/bullseye/Dockerfile
@@ -1,12 +1,12 @@
-FROM debian:stretch
+FROM debian:bullseye
MAINTAINER Christian Pointner <equinox@helsinki.at>
-LABEL at.helsinki.docker.os.distro=debian at.helsinki.docker.os.release=stretch
+LABEL at.helsinki.docker.os.distro=debian at.helsinki.docker.os.release=bullseye
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 '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 \
@@ -15,7 +15,7 @@ RUN set -x \
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 \
+ && 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/*