Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"]
6 changes: 6 additions & 0 deletions fpm/goss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"