From ef5aa3147c4673c78d2116d13707bcdfd70fa9c2 Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Sat, 17 Sep 2016 15:56:05 +0200
Subject: [PATCH] remove tini if s6 is used

---
 lychee/Dockerfile     | 1 -
 lychee/run.sh         | 2 +-
 privatebin/Dockerfile | 1 -
 privatebin/run.sh     | 2 +-
 rainloop/Dockerfile   | 1 -
 rainloop/run.sh       | 2 +-
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lychee/Dockerfile b/lychee/Dockerfile
index 7314e1c..5f843f1 100644
--- a/lychee/Dockerfile
+++ b/lychee/Dockerfile
@@ -31,7 +31,6 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
     s6 \
     su-exec \
     imagemagick \
-    tini@commuedge \
  && 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/upload_max_filesize = 2M/upload_max_filesize = 20M/g" \
diff --git a/lychee/run.sh b/lychee/run.sh
index bc7b61f..040ae9a 100644
--- a/lychee/run.sh
+++ b/lychee/run.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 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
-exec su-exec $UID:$GID /sbin/tini -- /bin/s6-svscan /etc/s6.d
+exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d
diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile
index e591268..1b2124a 100644
--- a/privatebin/Dockerfile
+++ b/privatebin/Dockerfile
@@ -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 \
diff --git a/privatebin/run.sh b/privatebin/run.sh
index cacc88c..3fa0485 100644
--- a/privatebin/run.sh
+++ b/privatebin/run.sh
@@ -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
diff --git a/rainloop/Dockerfile b/rainloop/Dockerfile
index 87ef24d..ec17a7b 100644
--- a/rainloop/Dockerfile
+++ b/rainloop/Dockerfile
@@ -11,7 +11,6 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
     nginx \
     s6 \
     su-exec \
-    tini@commuedge \
     php7-fpm@commuedge \
     php7-curl@commuedge \
     php7-iconv@commuedge \
diff --git a/rainloop/run.sh b/rainloop/run.sh
index c3929d9..7363eb0 100644
--- a/rainloop/run.sh
+++ b/rainloop/run.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 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