diff options
| -rw-r--r-- | Docker/Dockerfile-Alpine | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Newest | 12 | ||||
| -rw-r--r-- | Docker/Dockerfile-Oldest | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index e3b75a938..1e5a95125 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -5,7 +5,7 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"] RUN apk add --no-cache \ apache2 php-apache2 \ php php-curl php-gmp php-intl php-mbstring php-xml php-zip \ - php-ctype php-dom php-fileinfo php-iconv php-json php-opcache php-phar php-session php-simplexml php-xmlreader php-xmlwriter php-tokenizer php-zlib \ + php-ctype php-dom php-fileinfo php-iconv php-json php-opcache php-openssl php-phar php-session php-simplexml php-xmlreader php-xmlwriter php-xml php-tokenizer php-zlib \ php-pdo_sqlite php-pdo_mysql php-pdo_pgsql RUN mkdir -p /var/www/FreshRSS /run/apache2/ diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newest index c42080186..d5942c77e 100644 --- a/Docker/Dockerfile-Newest +++ b/Docker/Dockerfile-Newest @@ -4,10 +4,10 @@ ENV TZ UTC SHELL ["/bin/ash", "-eo", "pipefail", "-c"] RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \ apk add --no-cache \ - apache2 php81-apache2 \ - php81 php81-curl php81-gmp php81-intl php81-mbstring php81-xml php81-zip \ - php81-ctype php81-dom php81-fileinfo php81-iconv php81-json php81-opcache php81-phar php81-session php81-simplexml php81-xmlreader php81-xmlwriter php81-tokenizer php81-zlib \ - php81-pdo_sqlite php81-pdo_mysql php81-pdo_pgsql + apache2 php82-apache2 \ + php82 php82-curl php82-gmp php82-intl php82-mbstring php82-xml php82-zip \ + php82-ctype php82-dom php82-fileinfo php82-iconv php82-json php82-opcache php82-openssl php82-phar php82-session php82-simplexml php82-xmlreader php82-xmlwriter php82-xml php82-tokenizer php82-zlib \ + php82-pdo_sqlite php82-pdo_mysql php82-pdo_pgsql RUN mkdir -p /var/www/FreshRSS /run/apache2/ WORKDIR /var/www/FreshRSS @@ -39,8 +39,8 @@ 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/php81 /usr/bin/php; else true; fi && \ - echo 'memory_limit = 256M' > /etc/php81/conf.d/10_memory.ini && \ + if [ ! -f /usr/bin/php ]; then ln -s /usr/bin/php82 /usr/bin/php; else true; fi && \ + echo 'memory_limit = 256M' > /etc/php82/conf.d/10_memory.ini && \ # Disable built-in updates when using Docker, as the full image is supposed to be updated instead. sed -r -i "\\#disable_update#s#^.*#\t'disable_update' => true,#" ./config.default.php && \ touch /var/www/FreshRSS/Docker/env.txt && \ diff --git a/Docker/Dockerfile-Oldest b/Docker/Dockerfile-Oldest index 7dd6c2176..d0b27cc72 100644 --- a/Docker/Dockerfile-Oldest +++ b/Docker/Dockerfile-Oldest @@ -5,7 +5,7 @@ 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-iconv php7-json php7-opcache php7-openssl php7-phar php7-session php7-xmlreader php7-zlib \ + php7-ctype php7-dom php7-iconv php7-json php7-opcache php7-openssl php7-phar php7-session php7-xmlreader php7-xml php7-zlib \ php7-pdo_sqlite php7-pdo_mysql php7-pdo_pgsql RUN mkdir -p /var/www/FreshRSS /run/apache2/ |