From 910de7b38c92848ef6a2ae730491212affaf82bc Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 29 Feb 2024 15:49:43 +0100 Subject: [PATCH] use debian 12 + php 8.2 --- Containerfile | 8 ++++---- Containerfile.fpm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Containerfile b/Containerfile index be42ebe..afa52e4 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/php:8.1-apache-bullseye as builder +FROM docker.io/php:8.2-apache-bookworm as builder ARG VERSION=dev @@ -40,7 +40,7 @@ RUN set -xe;\ cp -r storage storage.skel &&\ rm -rf .git tests contrib CHANGELOG.md LICENSE .circleci .dependabot .github CODE_OF_CONDUCT.md .env.docker CONTRIBUTING.md README.md docker-compose.yml .env.testing phpunit.xml .env.example .gitignore .editorconfig .gitattributes .dockerignore /patches -FROM docker.io/php:8.1-apache-bullseye +FROM docker.io/php:8.2-apache-bookworm ARG DATE ARG VERSION=dev @@ -50,12 +50,12 @@ COPY worker-entrypoint.sh /worker-entrypoint.sh COPY websockets-entrypoint.sh /websockets-entrypoint.sh COPY schedule-entrypoint.sh /schedule-entrypoint.sh COPY wait-for-db.php /wait-for-db.php -COPY --from=builder /usr/local/lib/php/extensions/no-debug-non-zts-20210902 /usr/local/lib/php/extensions/no-debug-non-zts-20210902 +COPY --from=builder /usr/local/lib/php/extensions/no-debug-non-zts-20220829 /usr/local/lib/php/extensions/no-debug-non-zts-20220829 COPY --from=builder /usr/local/etc/php/conf.d /usr/local/etc/php/conf.d RUN set -xe;\ apt-get update &&\ - apt-get install --no-install-recommends -y libzip4 libpq5 libmagickwand-6.q16-6 libxpm4 libwebp6 &&\ + apt-get install --no-install-recommends -y libzip4 libpq5 libmagickwand-6.q16-6 libxpm4 libwebp7 &&\ apt-get install --no-install-recommends -y optipng pngquant jpegoptim gifsicle ffmpeg locales gosu dumb-init zip &&\ apt-get clean all &&\ rm -rf /var/lib/apt/lists/* diff --git a/Containerfile.fpm b/Containerfile.fpm index 7c3bd59..5ecee84 100644 --- a/Containerfile.fpm +++ b/Containerfile.fpm @@ -1,4 +1,4 @@ -FROM docker.io/php:8.1-fpm-bullseye as builder +FROM docker.io/php:8.2-fpm-bookworm as builder ARG VERSION=dev ARG DATE @@ -40,7 +40,7 @@ RUN set -xe;\ chown -R www-data:www-data public.skel storage.skel &&\ rm -rf .git tests contrib CHANGELOG.md LICENSE .circleci .dependabot .github CODE_OF_CONDUCT.md .env.docker CONTRIBUTING.md README.md docker-compose.yml .env.testing phpunit.xml .env.example .gitignore .editorconfig .gitattributes .dockerignore -FROM docker.io/php:8.1-fpm-bullseye +FROM docker.io/php:8.2-fpm-bookworm ARG VERSION=dev ARG DATE @@ -50,13 +50,13 @@ COPY worker-entrypoint.sh /worker-entrypoint.sh COPY schedule-entrypoint.sh /schedule-entrypoint.sh COPY websockets-entrypoint.sh /websockets-entrypoint.sh COPY wait-for-db.php /wait-for-db.php -COPY --from=builder /usr/local/lib/php/extensions/no-debug-non-zts-20210902 /usr/local/lib/php/extensions/no-debug-non-zts-20210902 +COPY --from=builder /usr/local/lib/php/extensions/no-debug-non-zts-20220829 /usr/local/lib/php/extensions/no-debug-non-zts-20220829 COPY --from=builder /usr/local/etc/php/conf.d /usr/local/etc/php/conf.d RUN set -xe;\ apt-get update &&\ apt-get upgrade -y &&\ - apt-get install --no-install-recommends -y libzip4 libpq5 libmagickwand-6.q16-6 libxpm4 libwebp6 &&\ + apt-get install --no-install-recommends -y libzip4 libpq5 libmagickwand-6.q16-6 libxpm4 libwebp7 &&\ apt-get install --no-install-recommends -y optipng pngquant jpegoptim gifsicle ffmpeg locales gosu dumb-init rsync zip &&\ apt-get clean all &&\ rm -rf /var/lib/apt/lists/*