Remove old django pid file (workaround #1)

ome · Oct 26, 2017 · 50a2e42 · 50a2e42
1 parent 3e86008
commit 50a2e42
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/98-cleanprevious.sh b/98-cleanprevious.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# This image isn't cleanly shutdown by docker stop
+# https://github.com/openmicroscopy/omero-web-docker/issues/1
+# This is a workaround until we figure out the root cause
+set -eu
+
+rm -f /opt/omero/web/OMERO.web/var/django.pid
diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@ RUN curl -L -o /usr/local/bin/dumb-init \
     https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 && \
     chmod +x /usr/local/bin/dumb-init
 ADD entrypoint.sh /usr/local/bin/
-ADD 50-config.py 60-default-web-config.sh 99-run.sh /startup/
+ADD 50-config.py 60-default-web-config.sh 98-cleanprevious.sh 99-run.sh /startup/
 
 USER omero-web
 RUN mkdir /opt/omero/web/OMERO.web/var