Merge pull request #60 from Icinga/feature/bullseye

Upgrade to Debian 11
This commit is contained in:
Julian Brost 2021-11-02 12:18:35 +01:00 committed by GitHub
commit f4cd5b2fc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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/*