|
|
@@ -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' \
|