Dropbox loves to die

4 files changed, 22 insertions, 2 deletions

diff --git a/dropbox/Dockerfile b/dropbox/Dockerfile
index d4565c8..7e6ff2b 100644
--- a/dropbox/Dockerfile
+++ b/dropbox/Dockerfile
@@ -2,12 +2,18 @@ FROM frolvlad/alpine-glibc:latest
 LABEL maintainer="Mike Crute <mike@crute.us>"
 
 RUN set -eu -o pipefail; \
-    apk --no-cache add su-exec dumb-init; \
+    apk --no-cache add dumb-init runit su-exec; \
     wget -O /tmp/dropbox.tar.gz https://www.dropbox.com/download?plat=lnx.x86_64; \
     mkdir -p /opt/dropbox; \
     tar -C /opt/dropbox/ --strip-components=1 -xf /tmp/dropbox.tar.gz; \
     rm -rf /tmp/*;
 
 ADD entrypoint.sh /
+ADD dropbox-srv/ /opt/dropbox-srv
+
 ENTRYPOINT [ "/entrypoint.sh" ]
-CMD [ "/opt/dropbox/dropboxd" ]
+
+# Dropbox is a persnickety process that will die without error for no obvious
+# reason. Run it with runsv so that it will get restarted when it does die
+# instead of killing the whole container..
+CMD [ "/sbin/runsv", "/opt/dropbox-srv" ]
diff --git a/dropbox/dropbox-srv/log/run b/dropbox/dropbox-srv/log/run
new file mode 100755
index 0000000..6193824
--- /dev/null
+++ b/dropbox/dropbox-srv/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cat -
diff --git a/dropbox/dropbox-srv/run b/dropbox/dropbox-srv/run
new file mode 100755
index 0000000..fd5ac2b
--- /dev/null
+++ b/dropbox/dropbox-srv/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/opt/dropbox/dropboxd
diff --git a/dropbox/entrypoint.sh b/dropbox/entrypoint.sh
index 16c8ebc..596cac6 100755
--- a/dropbox/entrypoint.sh
+++ b/dropbox/entrypoint.sh
@@ -22,6 +22,14 @@ adduser -u ${USER_UID} -h /home/${USERNAME} -D -G ${USERNAME} ${USERNAME}
 ln -s /srv/dropbox/data /home/${USERNAME}/Dropbox
 ln -s /srv/dropbox/config /home/${USERNAME}/.dropbox
 
+# Allow runsv to write its superisory files for the main process
+mkdir /opt/dropbox-srv/supervise
+chown dropbox:dropbox /opt/dropbox-srv/supervise
+
+# Allow runsv to write its superisory files for the log process
+mkdir /opt/dropbox-srv/log/supervise
+chown dropbox:dropbox /opt/dropbox-srv/log/supervise
+
 if [ "$@" == "/bin/sh" ]; then
     exec "$@"
 else