From d73e779eaf0a6ead3c6f2d0c1f534769110890f7 Mon Sep 17 00:00:00 2001
From: Nick <nick@myschuch.com>
Date: Thu, 5 Mar 2026 17:13:14 +1000
Subject: [PATCH 1/2] feat: Compass PHP extension package

---
 base/Dockerfile | 6 ------
 fpm/Dockerfile  | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 4ae8948..646db4a 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -2,7 +2,6 @@ ARG ALPINE_VERSION=3.21
 ARG PHP_VERSION=8.0
 
 FROM docker.io/skpr/docconv:alpine${ALPINE_VERSION} AS docconv
-FROM ghcr.io/skpr/compass-extension:v1.10.0-php${PHP_VERSION} AS compass
 
 FROM from_image AS base
 
@@ -79,11 +78,6 @@ RUN export SKPRMAIL_VERSION=1.0.3 && \
     curl -sSL https://github.com/skpr/mail/releases/download/v${SKPRMAIL_VERSION}/skprmail_${SKPRMAIL_VERSION}_linux_${TARGETARCH} -o /usr/local/bin/skprmail && \
     chmod +rx /usr/local/bin/skprmail
 
-# https://github.com/skpr/compass
-ENV COMPASS_ENABLED=false
-COPY --from=compass /etc/php/conf.d/00_compass.ini /etc/php/conf.d/00_compass.ini
-COPY --from=compass /usr/lib/php/modules/compass.so /usr/lib/php/modules/compass.so
-
 # Built using an updated build approach in this fork: https://github.com/skpr/docconv
 COPY --from=docconv /usr/local/bin/docconv /usr/local/bin/docconv
 
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index ca29f76..cea37c4 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -2,6 +2,7 @@ FROM from_image AS base
 ARG PHP_VERSION=8.0
 
 RUN apk --update --no-cache add \
+      php${PHP_VERSION}-compass \
       php${PHP_VERSION}-fpm
 
 COPY conf.d/50_fpm.ini /etc/php/conf.d/50_fpm.ini
@@ -33,6 +34,9 @@ COPY --from=ghcr.io/goss-org/goss:latest /usr/bin/goss /usr/bin/goss
 ADD goss.yml /tmp/goss.yml
 RUN goss --gossfile /tmp/goss.yml validate
 
+ENV COMPASS_ENABLED=false
+ENV COMPASS_FUNCTION_THRESHOLD=1000000
+
 # The final stage which is used to run the image.
 FROM base AS run
 CMD ["php-fpm", "-F"]

From b5eb9e033b567b26f136cbba591c1c663e6670d5 Mon Sep 17 00:00:00 2001
From: Nick <nick@myschuch.com>
Date: Thu, 5 Mar 2026 17:23:25 +1000
Subject: [PATCH 2/2] Adds a test

---
 fpm/goss.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fpm/goss.yml b/fpm/goss.yml
index bc8f64e..d8d6863 100644
--- a/fpm/goss.yml
+++ b/fpm/goss.yml
@@ -5,3 +5,9 @@ command:
     stdout:
       not:
         contain-substring: "WARNING"
+
+  check-php-compass-extension:
+    exec: "php -m | grep -i compass"
+    exit-status: 0
+    stdout:
+      contain-substring: "compass"