diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2023-02-08 13:07:47 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2023-02-08 13:07:47 (GMT) |
| commit | c01c1a68ab982fe9342a5691910583726c7c666d (patch) | |
| tree | b33f7feed0b3662728dadfe1c12645b784b95571 /ubuntu | |
| parent | 5c59be747cb999545e3c7a16ad135bcbec679b22 (diff) | |
ubuntu: add focal and jammy, remove bionice; move app images to bullseye
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/focal/Dockerfile (renamed from ubuntu/bionic/Dockerfile) | 12 | ||||
| -rw-r--r-- | ubuntu/jammy/Dockerfile | 31 |
2 files changed, 37 insertions, 6 deletions
diff --git a/ubuntu/bionic/Dockerfile b/ubuntu/focal/Dockerfile index 2877310..8ef4e1c 100644 --- a/ubuntu/bionic/Dockerfile +++ b/ubuntu/focal/Dockerfile @@ -1,12 +1,12 @@ -FROM ubuntu:bionic +FROM ubuntu:focal MAINTAINER Christian Pointner <equinox@helsinki.at> -LABEL at.helsinki.docker.os.distro=ubuntu at.helsinki.docker.os.release=bionic +LABEL at.helsinki.docker.os.distro=ubuntu at.helsinki.docker.os.release=focal 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 'deb http://apt.helsinki.at/ubuntu focal main universe' > /etc/apt/sources.list \ + && echo 'deb http://apt.helsinki.at/ubuntu focal-updates main universe' >> /etc/apt/sources.list \ + && echo 'deb http://apt.helsinki.at/ubuntu focal-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 \ @@ -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 bionic main' >>/etc/apt/sources.list.d/helsinki.list \ + && echo 'deb http://build.helsinki.at focal 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/jammy/Dockerfile b/ubuntu/jammy/Dockerfile new file mode 100644 index 0000000..72de593 --- /dev/null +++ b/ubuntu/jammy/Dockerfile @@ -0,0 +1,31 @@ +FROM ubuntu:jammy +MAINTAINER Christian Pointner <equinox@helsinki.at> + +LABEL at.helsinki.docker.os.distro=ubuntu at.helsinki.docker.os.release=jammy + +RUN set -x \ + && echo 'deb http://apt.helsinki.at/ubuntu jammy main universe' > /etc/apt/sources.list \ + && echo 'deb http://apt.helsinki.at/ubuntu jammy-updates main universe' >> /etc/apt/sources.list \ + && echo 'deb http://apt.helsinki.at/ubuntu jammy-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 jammy 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", "--"] |