diff options
| -rwxr-xr-x | build-app-images.sh | 4 | ||||
| -rwxr-xr-x | build-os-images.sh | 2 | ||||
| -rw-r--r-- | ffmpeg/bullseye/Dockerfile (renamed from ffmpeg/bionic/Dockerfile) | 2 | ||||
| -rw-r--r-- | gstreamer/bullseye/Dockerfile (renamed from gstreamer/bionic/Dockerfile) | 2 | ||||
| -rw-r--r-- | ubuntu/focal/Dockerfile (renamed from ubuntu/bionic/Dockerfile) | 12 | ||||
| -rw-r--r-- | ubuntu/jammy/Dockerfile | 31 |
6 files changed, 42 insertions, 11 deletions
diff --git a/build-app-images.sh b/build-app-images.sh index 56ca0a5..c6ee3ce 100755 --- a/build-app-images.sh +++ b/build-app-images.sh @@ -23,5 +23,5 @@ function run_build { echo "" } -run_build "ffmpeg:bionic" "ffmpeg/bionic" -run_build "gstreamer:bionic" "gstreamer/bionic" +run_build "ffmpeg:bullseye" "ffmpeg/bullseye" +run_build "gstreamer:bullseye" "gstreamer/bullseye" diff --git a/build-os-images.sh b/build-os-images.sh index 12c6b72..fde314b 100755 --- a/build-os-images.sh +++ b/build-os-images.sh @@ -39,6 +39,6 @@ for codename in buster bullseye; do done ## ubuntu -for codename in bionic; do +for codename in focal jammy; do run_build "ubuntu:$codename" "ubuntu/$codename" done diff --git a/ffmpeg/bionic/Dockerfile b/ffmpeg/bullseye/Dockerfile index aa04dda..80b7943 100644 --- a/ffmpeg/bionic/Dockerfile +++ b/ffmpeg/bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.helsinki.at/ubuntu:bionic +FROM docker.helsinki.at/ubuntu:bullseye MAINTAINER Christian Pointner <equinox@helsinki.at> RUN set -x \ diff --git a/gstreamer/bionic/Dockerfile b/gstreamer/bullseye/Dockerfile index 1bd627c..795084b 100644 --- a/gstreamer/bionic/Dockerfile +++ b/gstreamer/bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.helsinki.at/ubuntu:bionic +FROM docker.helsinki.at/ubuntu:bullseye MAINTAINER Christian Pointner <equinox@helsinki.at> RUN set -x \ 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", "--"] |