X-Git-Url: https://code.citadel.org/?p=citadel-docker.git;a=blobdiff_plain;f=Dockerfile;h=71bb53660eb225dfd37c6e314486d0f821f7ff94;hp=b32e243e68caf85aa522e094030ffda064aa35ae;hb=2bb55e4ad7fe19905142babb26f5dc76ae06354f;hpb=53f1d661d68848abf7da38db0bec8018f5926f18

diff --git a/Dockerfile b/Dockerfile
index b32e243..71bb536 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM bitnami/minideb:latest
 
-VOLUME /usr/local/citadel/data /usr/local/citadel/files /usr/local/citadel/keys
+VOLUME /citadel-data
 
 # Install prerequisites
 RUN install_packages make build-essential zlib1g-dev libldap2-dev libssl-dev gettext libical-dev libexpat1-dev curl libcurl4-openssl-dev git autoconf automake netbase supervisor
@@ -15,10 +15,12 @@ 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 'ln -sfv /usr/local/citadel/keys /usr/local/webcit/keys'
+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/
+ADD citadel-docker-startup.sh /usr/local/bin/
 
 # Ports
 EXPOSE 25/tcp
@@ -36,4 +38,4 @@ EXPOSE 995/tcp
 EXPOSE 2020/tcp
 EXPOSE 5222/tcp
 
-CMD ["supervisord", "-c", "/etc/supervisor.conf"]
+CMD /usr/local/bin/citadel-docker-startup.sh