From bf639f9b984185e1fb8157a24cc11e2f49b827c7 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 16 Jan 2021 19:39:15 +0100 Subject: Docker: Alpine 3.13 with PHP 8 (#3375) * Docker: Alppine 3.13 with PHP 8 PHP 8.0.1, Apache 2.4.46 Bug https://bugs.php.net/bug.php?id=78681 fixed in Alpine, so workaround removed from our Dockefile(s) Supports MySQL 8+ #fix https://github.com/FreshRSS/FreshRSS/issues/3191 * Changelog * Update CHANGELOG.md Co-authored-by: Frans de Jonge Co-authored-by: Frans de Jonge --- Docker/Dockerfile-Alpine | 11 ++++++----- Docker/Dockerfile-Newest | 3 --- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'Docker') diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index df3e2f3ed..53f8f8464 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -1,12 +1,12 @@ -FROM alpine:3.12 +FROM alpine:3.13 ENV TZ UTC SHELL ["/bin/ash", "-eo", "pipefail", "-c"] RUN apk add --no-cache \ - apache2 php7-apache2 \ - php7 php7-curl php7-gmp php7-intl php7-mbstring php7-xml php7-zip \ - php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-opcache php7-phar php7-session php7-simplexml php7-xmlreader php7-xmlwriter php7-tokenizer php7-zlib \ - php7-pdo_sqlite php7-pdo_mysql php7-pdo_pgsql + apache2 php8-apache2 \ + php8 php8-curl php8-gmp php8-intl php8-mbstring php8-xml php8-zip \ + php8-ctype php8-dom php8-fileinfo php8-iconv php8-json php8-opcache php8-phar php8-session php8-simplexml php8-xmlreader php8-xmlwriter php8-tokenizer php8-zlib \ + php8-pdo_sqlite php8-pdo_mysql php8-pdo_pgsql RUN mkdir -p /var/www/FreshRSS /run/apache2/ WORKDIR /var/www/FreshRSS @@ -38,6 +38,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ + if [ ! -f /usr/bin/php ]; then ln -s /usr/bin/php8 /usr/bin/php; else true; fi && \ touch /var/www/FreshRSS/Docker/env.txt && \ echo "27,57 * * * * . /var/www/FreshRSS/Docker/env.txt; \ su apache -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newest index 26e8e9c5e..55fa0db78 100644 --- a/Docker/Dockerfile-Newest +++ b/Docker/Dockerfile-Newest @@ -38,9 +38,6 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ - # https://bugs.php.net/bug.php?id=78681 \ - sed -r -i "s/php8_module/php_module/" \ - /etc/apache2/conf.d/php8-module.conf && \ if [ ! -f /usr/bin/php ]; then ln -s /usr/bin/php8 /usr/bin/php; else true; fi && \ touch /var/www/FreshRSS/Docker/env.txt && \ echo "27,57 * * * * . /var/www/FreshRSS/Docker/env.txt; \ -- cgit v1.2.3