+# Dockerfile for Citadel
+
FROM bitnami/minideb:latest
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 install_packages gcc make zlib1g-dev libldap2-dev libssl-dev gettext libical-dev libexpat1-dev curl libcurl4-openssl-dev git autoconf automake netbase libreadline-dev
+
+# Build our own local copy of Berkeley DB, because the one included with the system libs is too old.
+RUN sh -c 'mkdir /tmp/db_build && \
+ cd /tmp/db_build && \
+ curl -k https://easyinstall.citadel.org/db-6.2.32.NC.tar.gz | tar xvzf - && \
+ cd db-6.2.32.NC/build_unix && \
+ ../dist/configure --prefix=/usr/local/ctdlsupport --disable-compat185 --disable-cxx --disable-debug --disable-dump185 --disable-java --disable-tcl --disable-test --without-rpm && \
+ make && \
+ make install && \
+ cd /tmp && \
+ rm -fr /tmp/db_build'
-# Download and build libsieve
-RUN sh -c '( curl http://easyinstall.citadel.org/libsieve-2.2.7-ctdl2.tar.gz | tar xvzf - ) && cd libsieve-2.2.7/src && ./configure --prefix=/usr && make && make install'
+# Deploy "ctdlvisor", a small supervisor program which runs inside the container to wrangle the various services
+ADD ctdlvisor.c /tmp
# Download and build Citadel
-WORKDIR /tmp/ctdl_build
-RUN sh -c 'git clone git://git.citadel.org/appl/gitroot/citadel.git'
-RUN sh -c 'cd /tmp/ctdl_build/citadel/libcitadel && ./bootstrap && ./configure --prefix=/usr && make && make install'
-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 /tmp && 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/
-RUN sh -c 'chmod 755 /usr/local/bin/citadel-docker-startup.sh'
+RUN sh -c 'export CFLAGS=-I/usr/local/ctdlsupport/include && \
+ export LDFLAGS="-L/usr/local/ctdlsupport/lib -Wl,--rpath -Wl,/usr/local/ctdlsupport/lib" && \
+ mkdir /tmp/ctdl_build && \
+ cd /tmp/ctdl_build && \
+ git clone git://git.citadel.org/appl/gitroot/citadel.git && \
+ cd /tmp/ctdl_build/citadel/libcitadel && \
+ ./bootstrap && \
+ ./configure --prefix=/usr && \
+ make && \
+ make install && \
+ cd /tmp/ctdl_build/citadel/citadel && \
+ ./bootstrap && \
+ ./configure && \
+ make && \
+ make install && \
+ cd /tmp/ctdl_build/citadel/webcit && \
+ ./bootstrap && \
+ ./configure && \
+ make && \
+ make install && \
+ cd /tmp/ctdl_build/citadel/textclient && \
+ ./bootstrap && \
+ ./configure --prefix=/usr --ctdldir=/citadel_data && \
+ make && make install && \
+ cd /tmp && \
+ cc ctdlvisor.c -o /usr/local/bin/ctdlvisor && \
+ rm -vf /tmp/ctdlvisor.c && \
+ cd /tmp && \
+ rm -vfr /tmp/ctdl_build && \
+ rm -vrf /usr/local/citadel/data /usr/local/citadel/files /usr/local/citadel/keys /usr/local/webcit/keys'
# Ports
EXPOSE 25 80 110 119 143 443 465 504 563 587 993 995 2020 5222
# Let's go!
-CMD /usr/local/bin/citadel-docker-startup.sh
+ENTRYPOINT ["/usr/local/bin/ctdlvisor"]