remove tini if s6 is used

This commit is contained in:
Wonderfall
2016-09-17 15:56:05 +02:00
parent b2a444983c
commit ef5aa3147c
6 changed files with 3 additions and 6 deletions

View File

@ -10,7 +10,6 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
nginx \
s6 \
su-exec \
tini@commuedge \
php7-fpm@commuedge \
php7-gd@commuedge \
php7-mcrypt@commuedge \

View File

@ -1,3 +1,3 @@
#!/bin/sh
chown -R $UID:$GID /zerobin /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d
exec su-exec $UID:$GID /sbin/tini -- /bin/s6-svscan /etc/s6.d
exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d