fix: tini
This commit is contained in:
parent
643f9fd03c
commit
377889e098
11
Dockerfile
11
Dockerfile
@ -10,6 +10,8 @@ RUN export DEBIAN_FRONTEND="noninteractive" && \
|
|||||||
sed -i'' 's/\(LogFormat "%h.*combined\)/LogFormat "%a %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\"" combined/' "${APACHE_CONFDIR}/apache2.conf" && \
|
sed -i'' 's/\(LogFormat "%h.*combined\)/LogFormat "%a %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\"" combined/' "${APACHE_CONFDIR}/apache2.conf" && \
|
||||||
a2enconf remoteip && \
|
a2enconf remoteip && \
|
||||||
a2enmod remoteip headers rewrite && \
|
a2enmod remoteip headers rewrite && \
|
||||||
|
apt-get update && \
|
||||||
|
apt-get -qq --yes install tini && \
|
||||||
apt-get -qq --yes autoremove --purge && \
|
apt-get -qq --yes autoremove --purge && \
|
||||||
apt-get -qq --yes clean all && \
|
apt-get -qq --yes clean all && \
|
||||||
# Ici je ne supprime pas /usr/src car utilisé par les sous projets (docker php
|
# Ici je ne supprime pas /usr/src car utilisé par les sous projets (docker php
|
||||||
@ -29,14 +31,7 @@ RUN export DEBIAN_FRONTEND="noninteractive" && \
|
|||||||
' "/etc/apache2/sites-enabled/000-default.conf" && \
|
' "/etc/apache2/sites-enabled/000-default.conf" && \
|
||||||
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
|
ENTRYPOINT ["/usr/bin/tini", "--"]
|
||||||
ENV "TINI_VERSION" "v0.19.0"
|
|
||||||
ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini"
|
|
||||||
RUN chmod +x "/tini"
|
|
||||||
|
|
||||||
# TODO: actuellement tiny fout completement la merde
|
|
||||||
# TODO: on remets pour tester
|
|
||||||
ENTRYPOINT ["/tini", "--"]
|
|
||||||
|
|
||||||
CMD [ "docker-php-entrypoint", "apache2-foreground" ]
|
CMD [ "docker-php-entrypoint", "apache2-foreground" ]
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user