use PHP 7.4

pull/1/head
chris 2020-07-05 16:19:11 +02:00
parent 312b44ab00
commit c82ac10eab
1 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
FROM reg.zknt.org/zknt/debian-php as builder FROM reg.zknt.org/zknt/debian-php:7.4 as builder
RUN set -xe;\ RUN set -xe;\
apt-install git php-curl php-zip php-bcmath php-intl php-mbstring php-xml composer &&\ apt-install git php-curl php-zip php-bcmath php-intl php-mbstring php-xml composer &&\
@ -13,7 +13,7 @@ RUN set -xe;\
cp -r storage storage.skel &&\ cp -r storage storage.skel &&\
rm -rf .git tests contrib CHANGELOG.md LICENSE .circleci .dependabot .github CODE_OF_CONDUCT.md .env.docker CONTRIBUTING.md README.md docker-compose.yml .env.testing phpunit.xml .env.example .gitignore .editorconfig .gitattributes .dockerignore rm -rf .git tests contrib CHANGELOG.md LICENSE .circleci .dependabot .github CODE_OF_CONDUCT.md .env.docker CONTRIBUTING.md README.md docker-compose.yml .env.testing phpunit.xml .env.example .gitignore .editorconfig .gitattributes .dockerignore
FROM reg.zknt.org/zknt/debian-php FROM reg.zknt.org/zknt/debian-php:7.4
COPY --from=builder /var/www /var/www COPY --from=builder /var/www /var/www
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
COPY worker-entrypoint.sh /worker-entrypoint.sh COPY worker-entrypoint.sh /worker-entrypoint.sh
@ -21,8 +21,8 @@ COPY wait-for-db.php /wait-for-db.php
RUN apt-install php-curl php-zip php-bcmath php-intl php-mbstring php-xml optipng pngquant jpegoptim gifsicle ffmpeg php-imagick php-gd php-redis php-mysql &&\ RUN apt-install php-curl php-zip php-bcmath php-intl php-mbstring php-xml optipng pngquant jpegoptim gifsicle ffmpeg php-imagick php-gd php-redis php-mysql &&\
a2enmod rewrite &&\ a2enmod rewrite &&\
sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf &&\ sed -i 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf &&\
sed -i 's/^post_max_size.*/post_max_size = 100M/g' /etc/php/7.3/apache2/php.ini &&\ sed -i 's/^post_max_size.*/post_max_size = 100M/g' /etc/php/7.4/apache2/php.ini &&\
sed -i 's/^upload_max_filesize.*/upload_max_filesize = 100M/g' /etc/php/7.3/apache2/php.ini sed -i 's/^upload_max_filesize.*/upload_max_filesize = 100M/g' /etc/php/7.4/apache2/php.ini
WORKDIR /var/www WORKDIR /var/www
VOLUME /var/www/storage /var/www/bootstrap VOLUME /var/www/storage /var/www/bootstrap
ENTRYPOINT /entrypoint.sh ENTRYPOINT /entrypoint.sh