From 4920aa05d8de3f96ba5c1cc915165b67864e11e3 Mon Sep 17 00:00:00 2001
From: Nathaniel <I@nathaniel.land>
Date: Fri, 12 Sep 2025 15:50:18 -0500
Subject: [PATCH] Update example 'full' apache Dockerfile for Trixie

Since upgrading the Apache image to the Debian Trixie release, the
example of a "full" image is outdated. This updates it to work again.

Notably, it requires installing the Sury Debian repo as the official
repo no longer carries libc-client-dev.
---
 .examples/dockerfiles/full/apache/Dockerfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile
index 7ed0a9426..1f4213710 100644
--- a/.examples/dockerfiles/full/apache/Dockerfile
+++ b/.examples/dockerfiles/full/apache/Dockerfile
@@ -6,10 +6,13 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends \
         ffmpeg \
         ghostscript \
-        libmagickcore-6.q16-6-extra \
+        libmagickcore-7.q16-10-extra \
         procps \
         smbclient \
         supervisor \
+        lsb-release \
+        ca-certificates \
+        curl \
 #       libreoffice \
     ; \
     rm -rf /var/lib/apt/lists/*
@@ -18,6 +21,10 @@ RUN set -ex; \
     \
     savedAptMark="$(apt-mark showmanual)"; \
     \
+    curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb; \
+    dpkg -i /tmp/debsuryorg-archive-keyring.deb; \
+    sh -c 'echo "deb [signed-by=/usr/share/keyrings/debsuryorg-archive-keyring.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'; \
+    \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         libbz2-dev \