From f596c5fded6b678662ebfe73f558916425a147bf Mon Sep 17 00:00:00 2001 From: TonyRL Date: Tue, 10 Dec 2024 14:26:42 +0000 Subject: [PATCH] chore: bump to php8.2 fix #540 --- Dockerfile | 17 +++++++---------- src/s6/php-fpm/run | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 51016758..96d35d20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/alpine:3.19 AS builder +FROM docker.io/alpine:3.21 AS builder # Download ttrss via git WORKDIR /var/www @@ -53,7 +53,7 @@ RUN mkdir remove_iframe_sandbox && \ RUN mkdir wallabag_v2 && \ curl -sL https://github.com/joshp23/ttrss-to-wallabag-v2/archive/master.tar.gz | \ tar xzvpf - --strip-components=2 -C wallabag_v2 ttrss-to-wallabag-v2-master/wallabag_v2 - + ## Auth OIDC RUN mkdir auth_oidc && \ curl -sL https://gitlab.tt-rss.org/tt-rss/plugins/ttrss-auth-oidc/-/archive/master/ttrss-auth-oidc-master.tar.gz | \ @@ -83,7 +83,7 @@ RUN curl -sL https://github.com/levito/tt-rss-feedly-theme/archive/master.tar.gz RUN curl -sL https://github.com/DIYgod/ttrss-theme-rsshub/archive/master.tar.gz | \ tar xzvpf - --strip-components=2 -C . ttrss-theme-rsshub-master/dist/rsshub.css -FROM docker.io/alpine:3.19 +FROM docker.io/alpine:3.21 LABEL maintainer="Henry" @@ -104,18 +104,15 @@ ENV DB_PASS ttrss # Install dependencies RUN chmod -x /wait-for.sh && chmod -x /docker-entrypoint.sh && apk add --update --no-cache git nginx s6 curl sudo \ - php81 php81-fpm php81-phar php81-sockets php81-pecl-apcu \ - php81-pdo php81-gd php81-pgsql php81-pdo_pgsql php81-xmlwriter php81-opcache \ - php81-mbstring php81-intl php81-xml php81-curl php81-simplexml \ - php81-session php81-tokenizer php81-dom php81-fileinfo php81-ctype \ - php81-json php81-iconv php81-pcntl php81-posix php81-zip php81-exif php81-openssl \ - php81-gmp php81-pecl-imagick \ + php82 php82-fpm php82-ctype php82-curl php82-pecl-dom php82-exif php82-fileinfo php82-gd php82-iconv php82-intl php82-json php82-mbstring php82-opcache \ + php82-openssl php82-pcntl php82-pdo php82-pdo_pgsql php82-pgsql php82-phar php82-pecl-apcu php82-posix php82-session php82-simplexml php82-sockets php82-tokenizer php82-xml php82-xmlwriter php82-zip \ + php82-gmp php82-pecl-imagick \ ca-certificates && rm -rf /var/cache/apk/* \ # Update libiconv as the default version is too low # Do not bump this dependency https://gitlab.alpinelinux.org/alpine/aports/-/issues/12328 && apk add gnu-libiconv=1.15-r3 --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ \ && rm -rf /var/www \ - && ln -s /usr/bin/php81 /usr/bin/php + && ln -s /usr/bin/php82 /usr/bin/php ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php diff --git a/src/s6/php-fpm/run b/src/s6/php-fpm/run index bd4199b5..8642a0af 100755 --- a/src/s6/php-fpm/run +++ b/src/s6/php-fpm/run @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/sbin/php-fpm81 --nodaemonize +exec /usr/sbin/php-fpm82 --nodaemonize