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/
# 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