diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-01-04 22:33:31 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-01-04 22:33:31 +0100 |
| commit | a6ea90e58b807d18fff601135e3e697b38895ca1 (patch) | |
| tree | 96a0124c77be2ac15b45b9203636519b378110bf /Docker | |
| parent | 1335a0e3cf11a0d4248e9eaaf748b89e6df741ef (diff) | |
Docker :newest Alpine PHP 8.1 (#4121)
* Docker :newest Alpine PHP 8.1
Update our `:newest` development image to use PHP 8.1 in alpine:edge
* Increase memory for tests
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/Dockerfile-Newest | 14 | ||||
| -rw-r--r-- | Docker/Dockerfile-Oldest | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newest index d97fbccc6..c42080186 100644 --- a/Docker/Dockerfile-Newest +++ b/Docker/Dockerfile-Newest @@ -2,11 +2,12 @@ FROM alpine:edge ENV TZ UTC SHELL ["/bin/ash", "-eo", "pipefail", "-c"] -RUN apk add --no-cache \ - 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 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 RUN mkdir -p /var/www/FreshRSS /run/apache2/ WORKDIR /var/www/FreshRSS @@ -38,7 +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/php8 /usr/bin/php; else true; fi && \ + 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 && \ # 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 51649869b..7dd6c2176 100644 --- a/Docker/Dockerfile-Oldest +++ b/Docker/Dockerfile-Oldest @@ -39,6 +39,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ if [ ! -f /usr/bin/php ]; then ln -s /usr/bin/php7 /usr/bin/php; else true; fi && \ + echo 'memory_limit = 256M' > /etc/php7/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 && \ |