From 09e4b9d31883beaf275cde0506921c794e6ec3ce Mon Sep 17 00:00:00 2001
From: Martin Honermeyer <maze@strahlungsfrei.de>
Date: Sat, 15 Nov 2014 18:44:05 +0100
Subject: [PATCH] Do not try to initialize wiki if it exists already

(Tiddlywiki 5.1.x fails when running `--init` on an existing wiki.)
---
 Dockerfile        | 5 ++++-
 init-and-run-wiki | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100755 init-and-run-wiki

diff --git a/Dockerfile b/Dockerfile
index 12c67fb..841becf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,9 @@ RUN npm install -g tiddlywiki
 VOLUME /var/lib/tiddlywiki
 WORKDIR /var/lib/tiddlywiki
 
+# Add init-and-run script
+ADD init-and-run-wiki /usr/local/bin/init-and-run-wiki
+
 # Meta
-CMD tiddlywiki mywiki --init server && tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html user "" 0.0.0.0
+CMD ["/usr/local/bin/init-and-run-wiki"]
 EXPOSE 8080
diff --git a/init-and-run-wiki b/init-and-run-wiki
new file mode 100755
index 0000000..b43bf23
--- /dev/null
+++ b/init-and-run-wiki
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+if [ ! -d /var/lib/tiddlywiki/mywiki ]; then
+  tiddlywiki mywiki --init server
+fi
+
+exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html user "" 0.0.0.0