Build debian11 using sury packages (#10)

Author: macropin

.github/workflows/multi-build-push.yml

@@ -12,7 +12,7 @@ on:
       targets:
         description: 'Build targets (JSON array)'
         type: string
-        default: '["debian13", "debian12"]'
+        default: '["debian13", "debian12", "debian11"]'
         required: false
 
 env:
@@ -26,7 +26,7 @@ jobs:
   build_and_push:
     strategy:
       matrix:
-        version: ${{ fromJSON(inputs.targets || '["debian13", "debian12"]') }}
+        version: ${{ fromJSON(inputs.targets || '["debian13", "debian12", "debian11"]') }}
 
     runs-on: ubuntu-latest
     steps:

README.md

@@ -17,7 +17,7 @@ These images are available from:
 
 ## Features
 
-- **Multiple PHP Versions:** Support for a wide range of PHP versions, from modern PHP 8.x to legacy PHP 5.4.
+- **Multiple PHP Versions:** Support for a wide range of PHP versions, from modern PHP 8.x to legacy PHP 5.4. Uses the [deb.sury.org](https://deb.sury.org/) repository for up-to-date PHP packages on Legacy Debian images.
 - **Apache 2.4:** Comes with Apache 2.4 pre-configured to work with PHP-FPM.
 - **Process Management:** Uses `s6` for process supervision, ensuring that both Apache and PHP-FPM are always running.
 - **Configuration Templating:** Uses `gomplate` to allow for dynamic configuration of Apache, PHP, and other services using environment variables.
@@ -35,6 +35,11 @@ These images are available from:
 ### Legacy Images
 
 - **[Debian 11 (Bullseye) Base](/debian11)** - For legacy PHP applications that require PHP 7.4.
+
+## Obsolete Images
+
+These are no longer built.
+
 - **[Debian 10 (Buster) Base](/debian10)** - For legacy PHP applications that require PHP 7.3.
 - **[Debian 9 (Stretch) Base](/debian9)** - For legacy PHP applications that require PHP 7.0.
 - **[CentOS 7 Base](/centos7)** - For legacy PHP applications that require PHP 5.4.

debian11/Dockerfile

@@ -18,6 +18,12 @@ RUN \
   usermod -u 48 www-data && \
   groupmod -g 48 www-data
 
+# Update apt sources to use archive.debian.org for EOL Debian 11
+RUN set -x \
+  && echo 'deb http://archive.debian.org/debian bullseye main' > /etc/apt/sources.list \
+  && echo 'deb http://archive.debian.org/debian-security bullseye-security main' >> /etc/apt/sources.list \
+  ;
+
 # Install bash-container functions
 RUN set -x \
   && if ! command -v wget > /dev/null; then \
@@ -78,7 +84,11 @@ RUN set -x \
 RUN \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  apt-get install --no-install-recommends --no-install-suggests -y wget curl ca-certificates git gnupg openssh-client msmtp-mta apache2 libapache2-mod-xsendfile imagemagick ghostscript s6 \
+  apt-get install --no-install-recommends --no-install-suggests -y wget curl ca-certificates gnupg && \
+  curl -sS https://packages.sury.org/php/apt.gpg | gpg --dearmor -o /usr/share/keyrings/sury-php.gpg && \
+  echo "deb [signed-by=/usr/share/keyrings/sury-php.gpg] https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list && \
+  apt-get update && \
+  apt-get install --no-install-recommends --no-install-suggests -y git openssh-client msmtp-mta apache2 libapache2-mod-xsendfile imagemagick ghostscript s6 \
   php7.4-apcu \
   php7.4-cli \
   php7.4-curl \

debian11/README.md

@@ -4,7 +4,7 @@ This is an Apache and php-fpm image:
 
 - Base: Debian 11 (Bullseye)
 - Apache httpd: 2.4
-- PHP: 7.4
+- PHP: 7.4 (via [deb.sury.org](https://deb.sury.org/))
 
 This image is designed to be quite configurable and as such is good for getting
 started but probably not a great base if you want a highly optimised container.