Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update docker images to use PHP 8

Browse source 
- fixes https://github.com/shaarli/Shaarli/issues/1868
This commit is contained in:
nodiscc 2022-08-11 13:24:12 +02:00
parent 6180c859d3
commit db33cd79b5
No known key found for this signature in database
GPG key ID: 067FC4266A4B6909
2 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Dockerfile
View file

@ -32,29 +32,29 @@ LABEL maintainer="Shaarli Community"
RUN apk --update --no-cache add \ RUN apk --update --no-cache add \
ca-certificates \ ca-certificates \
nginx \ nginx \
php7 \ php8 \
php7-ctype \ php8-ctype \
php7-curl \ php8-curl \
php7-fpm \ php8-fpm \
php7-gd \ php8-gd \
php7-iconv \ php8-iconv \
php7-intl \ php8-intl \
php7-json \ php8-json \
php7-mbstring \ php8-mbstring \
php7-openssl \ php8-openssl \
php7-session \ php8-session \
php7-xml \ php8-xml \
php7-simplexml \ php8-simplexml \
php7-zlib \ php8-zlib \
s6 s6
COPY .docker/nginx.conf /etc/nginx/nginx.conf COPY .docker/nginx.conf /etc/nginx/nginx.conf
COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf COPY .docker/php-fpm.conf /etc/php8/php-fpm.conf
COPY .docker/services.d /etc/services.d COPY .docker/services.d /etc/services.d
RUN rm -rf /etc/php7/php-fpm.d/www.conf \ RUN rm -rf /etc/php8/php-fpm.d/www.conf \
&& sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php7/php.ini \ && sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php8/php.ini \
&& sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php7/php.ini && sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php8/php.ini
WORKDIR /var/www WORKDIR /var/www

36
Dockerfile.armhf
View file

@ -12,7 +12,7 @@ RUN apk --update --no-cache add py2-pip \
# - Resolve PHP dependencies with Composer # - Resolve PHP dependencies with Composer
FROM arm32v6/alpine:3.16 as composer FROM arm32v6/alpine:3.16 as composer
COPY --from=docs /usr/src/app/shaarli /app/shaarli COPY --from=docs /usr/src/app/shaarli /app/shaarli
RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \ RUN apk --update --no-cache add php8-curl php8-mbstring php8-simplexml composer \
&& cd /app/shaarli \ && cd /app/shaarli \
&& composer --prefer-dist --no-dev install && composer --prefer-dist --no-dev install
@ -34,28 +34,28 @@ LABEL maintainer="Shaarli Community"
RUN apk --update --no-cache add \ RUN apk --update --no-cache add \
ca-certificates \ ca-certificates \
nginx \ nginx \
php7 \ php8 \
php7-ctype \ php8-ctype \
php7-curl \ php8-curl \
php7-fpm \ php8-fpm \
php7-gd \ php8-gd \
php7-iconv \ php8-iconv \
php7-intl \ php8-intl \
php7-json \ php8-json \
php7-mbstring \ php8-mbstring \
php7-openssl \ php8-openssl \
php7-session \ php8-session \
php7-xml \ php8-xml \
php7-zlib \ php8-zlib \
s6 s6
COPY .docker/nginx.conf /etc/nginx/nginx.conf COPY .docker/nginx.conf /etc/nginx/nginx.conf
COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf COPY .docker/php-fpm.conf /etc/php8/php-fpm.conf
COPY .docker/services.d /etc/services.d COPY .docker/services.d /etc/services.d
RUN rm -rf /etc/php7/php-fpm.d/www.conf \ RUN rm -rf /etc/php8/php-fpm.d/www.conf \
&& sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php7/php.ini \ && sed -i 's/post_max_size.*/post_max_size = 10M/' /etc/php8/php.ini \
&& sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php7/php.ini && sed -i 's/upload_max_filesize.*/upload_max_filesize = 10M/' /etc/php8/php.ini
WORKDIR /var/www WORKDIR /var/www