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
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
EXPOSE 2020/tcp
EXPOSE 5222/tcp
-CMD ["supervisord", "-c", "/etc/supervisor.conf"]
+CMD /usr/local/bin/citadel-docker-startup.sh