ubuntu: add focal and jammy, remove bionice; move app images to bullseye

1 files changed, 0 insertions, 31 deletions

diff --git a/ubuntu/bionic/Dockerfile b/ubuntu/bionic/Dockerfile
deleted file mode 100644
index 2877310..0000000
--- a/ubuntu/bionic/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM ubuntu:bionic
-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 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 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 bionic 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", "--"]