From 50a2e42f77a3a1ab18d1541d1cf3e18b12c9247d Mon Sep 17 00:00:00 2001
From: Simon Li <spli@dundee.ac.uk>
Date: Thu, 26 Oct 2017 17:24:11 +0100
Subject: [PATCH] Remove old django pid file (workaround
 https://github.com/openmicroscopy/omero-web-docker/issues/1)

---
 98-cleanprevious.sh | 7 +++++++
 Dockerfile          | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100755 98-cleanprevious.sh

diff --git a/98-cleanprevious.sh b/98-cleanprevious.sh
new file mode 100755
index 00000000..7e487060
--- /dev/null
+++ 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
index d107dd7c..2f7c218c 100644
--- 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