frankenphp update

Author: deluxetom

8.4-frankenphp/Dockerfile

@@ -9,60 +9,66 @@ ENV PORT=$PORT SERVER_NAME=":80, :$PORT"
 ENV COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_NO_INTERACTION=1 COMPOSER_CACHE_DIR="/tmp"
 ENV PHP_INI_SCAN_DIR=":$PHP_INI_DIR/app.conf.d"
 
+ENV EXTENSIONS="amqp apcu ast bcmath exif ffi gd gettext gmp igbinary imagick intl maxminddb mongodb opcache pcntl pdo_mysql pdo_pgsql redis sockets sysvmsg sysvsem sysvshm uuid xsl zip"
+
+ENV BUILD_DEPS="make git autoconf wget"
+
 COPY --link --chmod=755 ./8.4-frankenphp/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 
 ENTRYPOINT ["docker-entrypoint"]
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+# Composer install
+COPY --from=composer/composer:2-bin /composer /usr/bin/composer
+
+RUN apt-get update && apt-get install -y --no-install-recommends ${BUILD_DEPS} \
         acl \
         file \
         gettext \
-        gifsicle \
-        git \
-        imagemagick \
-        jpegoptim \
-        libexif-dev \
-        libheif-dev \
-        libvips42 \
-        optipng \
-        pngquant \
         procps \
         supervisor \
         unzip \
-        webp \
         zip \
+        imagemagick \
+        webp \
+        gifsicle \
+        jpegoptim \
+        optipng \
+        pngquant \
+        libnss3-tools \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN set -eux; \
-	install-php-extensions \
-        @composer \
-        amqp \
-        apcu \
-        bcmath \
-        exif \
-        ffi \
-        gd \
-        gmp \
-        igbinary \
-        imagick \
-        intl \
-        maxminddb \
-        mongodb \
-        opcache \
-        pcntl \
-        pdo_mysql \
-        pdo_pgsql \
-        redis \
-        sockets \
-        sysvmsg \
-        sysvsem \
-        sysvshm \
-        uuid \
-        xsl \
-        zip \
-	;
+####################################################################################################
+# Install latest libvips
+# @see https://github.com/dooman87/imagemagick-docker/blob/main/Dockerfile.bookworm
+####################################################################################################
+ARG VIPS_VERSION=8.17.0
+ENV VIPS_BUILD_DEPS="build-essential ninja-build meson wget pkg-config"
+ENV VIPS_DEPS="libvips-dev"
+ENV LD_LIBRARY_PATH="/usr/local/lib"
+ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+
+RUN apt-get -y update && \
+	apt-get -y upgrade && \
+	apt-get remove --autoremove --purge -y libvips && \
+    apt-get install -y --no-install-recommends ${VIPS_BUILD_DEPS} ${VIPS_DEPS} && \
+    cd /usr/local/src && wget https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz && \
+    xz -d -v vips-${VIPS_VERSION}.tar.xz && tar xf vips-${VIPS_VERSION}.tar && \
+    cd vips-${VIPS_VERSION} && \
+    meson setup build --libdir lib && meson compile -C build && meson install -C build && \
+    apt-get remove --autoremove --purge -y ${VIPS_BUILD_DEPS} && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /usr/local/src/vips-*
+
+# Install PHP extensions
+RUN set -eux; install-php-extensions $EXTENSIONS
+
+# Imagick version
+RUN php -r 'var_dump(Imagick::getVersion());'
+
+# Imagick formats
+RUN php -r 'var_dump(Imagick::queryFormats());'
 
 # Copying manifest files to host
 COPY ./8.4-frankenphp/manifest /

…-frankenphp/manifest/etc/caddy/Caddyfile …kenphp/manifest/etc/frankenphp/Caddyfile8.4-frankenphp/manifest/etc/caddy/Caddyfile renamed to 8.4-frankenphp/manifest/etc/frankenphp/Caddyfile 8.4-frankenphp/manifest/etc/caddy/Caddyfile renamed to 8.4-frankenphp/manifest/etc/frankenphp/Caddyfile

@@ -1,5 +1,5 @@
 [program:frankenphp]
-command=/usr/local/bin/frankenphp run --config /etc/caddy/Caddyfile --adapter caddyfile
+command=/usr/local/bin/frankenphp run --config /etc/frankenphp/Caddyfile --adapter caddyfile
 autostart=true
 autorestart=true
 priority=10

…nphp/manifest/etc/caddy/worker.Caddyfile …manifest/etc/frankenphp/worker.Caddyfile8.4-frankenphp/manifest/etc/caddy/worker.Caddyfile renamed to 8.4-frankenphp/manifest/etc/frankenphp/worker.Caddyfile 8.4-frankenphp/manifest/etc/caddy/worker.Caddyfile renamed to 8.4-frankenphp/manifest/etc/frankenphp/worker.Caddyfile

@@ -66,7 +66,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends ${BUILD_DEPS} \
 # Install latest libvips
 # @see https://github.com/dooman87/imagemagick-docker/blob/main/Dockerfile.bookworm
 ####################################################################################################
-ARG VIPS_VERSION=8.16.0
+ARG VIPS_VERSION=8.17.0
 ENV VIPS_BUILD_DEPS="build-essential ninja-build meson pkg-config"
 ENV VIPS_DEPS="libvips-dev"
 ENV LD_LIBRARY_PATH="/usr/local/lib"