Go to 7.4 + tiny 0.18.0

This commit is contained in:
Julien Cabillot 2020-01-07 20:14:53 -05:00
parent f0d39cf0fa
commit 05ea37e57d

View File

@ -1,4 +1,4 @@
FROM "php:7.1-apache" FROM "php:7.4-apache"
LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>" LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
@ -30,12 +30,13 @@ RUN export DEBIAN_FRONTEND="noninteractive" && \
echo "error_reporting=E_ALL\nerror_log=/proc/self/fd/2\nlog_errors=On\nexpose_php=Off" > "/usr/local/etc/php/conf.d/override.ini" echo "error_reporting=E_ALL\nerror_log=/proc/self/fd/2\nlog_errors=On\nexpose_php=Off" > "/usr/local/etc/php/conf.d/override.ini"
# Add Tini # Add Tini
ENV "TINI_VERSION" "v0.16.1" ENV "TINI_VERSION" "v0.18.0"
ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini" ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini"
RUN chmod +x "/tini" RUN chmod +x "/tini"
# TODO: actuellement tiny fout completement la merde # TODO: actuellement tiny fout completement la merde
#ENTRYPOINT ["/tini", "--"] # TODO: on remets pour tester
ENTRYPOINT ["/tini", "--"]
CMD [ "docker-php-entrypoint", "apache2-foreground" ] CMD [ "docker-php-entrypoint", "apache2-foreground" ]