hoellen/dockerfiles
1
0
Fork 0
mirror of https://github.com/hoellen/dockerfiles.git synced 2025-04-20 04:19:18 +00:00
Code Issues Projects Releases Wiki Activity

remove tini if s6 is used

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lychee/Dockerfile
View File

@ -31,7 +31,6 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
s6 \ s6 \
su-exec \ su-exec \
imagemagick \ imagemagick \
tini@commuedge \
&& sed -i -e "s/max_execution_time = 30/max_execution_time = 200/g" \ && sed -i -e "s/max_execution_time = 30/max_execution_time = 200/g" \
-e "s/post_max_size = 8M/post_max_size = 100M/g" \ -e "s/post_max_size = 8M/post_max_size = 100M/g" \
-e "s/upload_max_filesize = 2M/upload_max_filesize = 20M/g" \ -e "s/upload_max_filesize = 2M/upload_max_filesize = 20M/g" \

2
lychee/run.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
mkdir /lychee/uploads/big /lychee/uploads/import /lychee/uploads/medium /lychee/uploads/thumb mkdir /lychee/uploads/big /lychee/uploads/import /lychee/uploads/medium /lychee/uploads/thumb
chown -R $UID:$GID /lychee /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d chown -R $UID:$GID /lychee /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

1
privatebin/Dockerfile
View File

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

2
privatebin/run.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
chown -R $UID:$GID /zerobin /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d 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

1
rainloop/Dockerfile
View File

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

2
rainloop/run.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
chown -R $UID:$GID /rainloop /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d chown -R $UID:$GID /rainloop /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