X-Git-Url: https://code.citadel.org/?p=citadel-docker.git;a=blobdiff_plain;f=Dockerfile;fp=Dockerfile;h=386e6b699c8b5fe823fc0e1ab642e0ffced695da;hp=b32e243e68caf85aa522e094030ffda064aa35ae;hb=fc664a5b94203934293d5b9b84e264c25ae99424;hpb=e5d08c815bbbda67664caf98854e7684b1a6b5b8

diff --git a/Dockerfile b/Dockerfile
index b32e243..386e6b6 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,11 @@ 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'
 
 # Supervisor
 ADD supervisor.conf /etc/
+ADD citadel-docker-startup.sh /usr/local/bin/
 
 # Ports
 EXPOSE 25/tcp
@@ -36,4 +37,4 @@ EXPOSE 995/tcp
 EXPOSE 2020/tcp
 EXPOSE 5222/tcp
 
-CMD ["supervisord", "-c", "/etc/supervisor.conf"]
+CMD /usr/local/bin/citadel-docker-startup.sh