From e45e53de586e62e071b83857c1d4b3ae8eac2898 Mon Sep 17 00:00:00 2001 From: Jessica Smith Date: Wed, 21 Oct 2026 20:37:18 +0100 Subject: [PATCH] Update control to latest PHP --- .../{entrypoint.sh => 00-entrypoint.sh} | 0 docker/production/Dockerfile | 16 +++++----------- 2 files changed, 5 insertions(+), 11 deletions(-) rename docker/production/{entrypoint.sh => 00-entrypoint.sh} (100%) diff --git a/docker/production/entrypoint.sh b/docker/production/00-entrypoint.sh similarity index 100% rename from docker/production/entrypoint.sh rename to docker/production/00-entrypoint.sh diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 71992eff..c5e2abd5 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -1,5 +1,5 @@ # Use the FrankenPHP image for building/running composer -FROM ghcr.io/mintopia/php-frankenphp-base:8.4.10 AS composer +FROM ghcr.io/mintopia/php:8.4-alpine-cli AS composer WORKDIR /app/ ENV HOME=/tmp @@ -30,17 +30,11 @@ RUN npm install --production=false && \ npm run build # Now our final image -FROM ghcr.io/mintopia/php-frankenphp-base:8.4.10 +FROM ghcr.io/mintopia/php:8.4-alpine-frankenphp LABEL org.opencontainers.image.authors="jess@mintopia.net" COPY --from=npm /app /app -COPY docker/production/entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh && \ +COPY docker/production/00-entrypoint.sh /docker-entrypoint.d/00-entrypoint.sh +RUN chmod +x /docker-entrypoint.d/00-entrypoint.sh && \ mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \ - echo 'memory_limit = 512M' > /usr/local/etc/php/conf.d/memory_limit.ini && \ - echo 'session.upload_progress.enabled = 0' > /usr/local/etc/php/conf.d/session_upload_progress.ini \ - -COPY docker/Caddyfile / - -ENTRYPOINT ["/entrypoint.sh"] -CMD ["php", "artisan", "octane:frankenphp", "--caddyfile=/Caddyfile", "--admin-host=0.0.0.0", "--port=80"] + echo 'memory_limit = 512M' > /usr/local/etc/php/conf.d/memory_limit.ini