From 28a3be744036fc47aad21ca2abe0701180eab07b Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 2 Nov 2021 11:16:06 +0100 Subject: [PATCH] Upgrade to Debian 11 --- Dockerfile | 6 +++--- action-base.list | 2 +- action.Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd67d8a..1b64752 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Icinga Web 2 Docker image | (c) 2020 Icinga GmbH | GPLv2+ -FROM golang:buster as entrypoint +FROM golang:bullseye as entrypoint COPY entrypoint /entrypoint @@ -8,9 +8,9 @@ WORKDIR /entrypoint RUN ["go", "build", "."] -FROM debian:buster-slim +FROM debian:bullseye-slim -RUN ["bash", "-exo", "pipefail", "-c", "export DEBIAN_FRONTEND=noninteractive; apt-get update; apt-get install --no-install-{recommends,suggests} -y apache2 ca-certificates libapache2-mod-php7.3 locales-all php-{imagick,redis} php7.3-{bcmath,bz2,common,curl,dba,enchant,gd,gmp,imap,interbase,intl,json,ldap,mbstring,mysql,odbc,opcache,pgsql,pspell,readline,recode,snmp,soap,sqlite3,sybase,tidy,xml,xmlrpc,xsl,zip}; apt-get clean; rm -vrf /var/lib/apt/lists/*"] +RUN ["bash", "-exo", "pipefail", "-c", "export DEBIAN_FRONTEND=noninteractive; apt-get update; apt-get install --no-install-{recommends,suggests} -y apache2 ca-certificates libapache2-mod-php7.4 locales-all php-{imagick,redis} php7.4-{bcmath,bz2,common,curl,dba,enchant,gd,gmp,imap,interbase,intl,json,ldap,mbstring,mysql,odbc,opcache,pgsql,pspell,readline,snmp,soap,sqlite3,sybase,tidy,xml,xmlrpc,xsl,zip}; apt-get clean; rm -vrf /var/lib/apt/lists/*"] COPY --from=entrypoint /entrypoint/entrypoint /entrypoint COPY entrypoint/db-init /entrypoint-db-init diff --git a/action-base.list b/action-base.list index 4851309..8306e7c 100644 --- a/action-base.list +++ b/action-base.list @@ -1,3 +1,3 @@ # Icinga Web 2 Docker image | (c) 2020 Icinga GmbH | GPLv2+ -deb [arch=amd64] https://download.docker.com/linux/debian buster stable +deb [arch=amd64] https://download.docker.com/linux/debian bullseye stable diff --git a/action.Dockerfile b/action.Dockerfile index 917ba7a..5b42f43 100644 --- a/action.Dockerfile +++ b/action.Dockerfile @@ -10,7 +10,7 @@ RUN mkdir actions ;\ rm -rf *.git -FROM debian:buster-slim +FROM debian:bullseye-slim SHELL ["/bin/bash", "-exo", "pipefail", "-c"] ENV DEBIAN_FRONTEND noninteractive @@ -27,7 +27,7 @@ ADD action-base.list /etc/apt/sources.list.d/docker.list RUN apt-get update ;\ apt-get install --no-install-{recommends,suggests} -y \ - composer docker-ce-cli git nodejs patch php7.3-zip ;\ + composer docker-ce-cli git nodejs patch php7.4-zip ;\ apt-get clean ;\ rm -vrf /var/lib/apt/lists/*