New startup script

diff --git a/Dockerfile b/Dockerfile
index 386e6b699c8b5fe823fc0e1ab642e0ffced695da..71bb53660eb225dfd37c6e314486d0f821f7ff94 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,8 @@ RUN sh -c 'cd /tmp/ctdl_build/citadel/libcitadel && ./bootstrap && ./configure -
 RUN sh -c 'cd /tmp/ctdl_build/citadel/citadel && ./bootstrap && ./configure && make && make install'
 RUN sh -c 'cd /tmp/ctdl_build/citadel/webcit && ./bootstrap && ./configure && make && make install'
 RUN sh -c 'cd /tmp/ctdl_build/citadel/textclient && ./bootstrap && ./configure --prefix=/usr && make && make install'
-RUN sh -c 'cd / && rm vfr /tmp/ctdl_build'
+RUN sh -c 'cd / && rm -vfr /tmp/ctdl_build'
+RUN sh -c 'rm -vrf /usr/local/citadel/data /usr/local/citadel/files /usr/local/citadel/keys /usr/local/webcit/keys'
 
 # Supervisor
 ADD supervisor.conf /etc/

diff --git a/citadel-docker-startup.sh b/citadel-docker-startup.sh
index 9382ea1261c6e744f7ac4d7aad551bf1c39516f0..64d63871e0f4b385f6dc20fa0923558150a87a90 100755 (executable)
--- a/citadel-docker-startup.sh
+++ b/citadel-docker-startup.sh
@@ -2,10 +2,18 @@
 
 # This is the script that is run when the Citadel Docker Container starts up.
 
+
+# Any of these can fail, since they may already exist
 mkdir /citadel-data
-mkdir -p /citadel-data/data && rm -vfr /usr/local/citadel/data && ln -sfv /citadel-data/data /usr/local/citadel/data
-mkdir -p /citadel-data/files && rm -vfr  /usr/local/citadel/files && ln -sfv /citadel-data/files /usr/local/citadel/files
-mkdir -p /citadel-data/keys && rm -vfr /usr/local/citadel/keys && ln -sfv /citadel-data/keys /usr/local/citadel/keys
-rmdir -v /usr/local/webcit/keys && ln -sfv /citadel-data/keys /usr/local/webcit/keys
+mkdir -p /citadel-data/data
+mkdir -p /citadel-data/files
+mkdir -p /citadel-data/keys
+
+# Now create the links
+ln -sfv /citadel-data/data /usr/local/citadel/data
+ln -sfv /citadel-data/files /usr/local/citadel/files
+ln -sfv /citadel-data/keys /usr/local/citadel/keys
+ln -sfv /citadel-data/keys /usr/local/webcit/keys
 
+# supervisord will take it from here
 exec supervisor