Fleshing out the command line options for run-citadel.sh

[citadel-docker.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 386e6b699c8b5fe823fc0e1ab642e0ffced695da..cf9baea3d997f6ed8ccd4645877541d54000e7bb 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,40 +1,47 @@
+# 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 make build-essential zlib1g-dev libldap2-dev libssl-dev gettext libical-dev libexpat1-dev curl libcurl4-openssl-dev git autoconf automake netbase libreadline-dev
 
-# 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 / && rm vfr /tmp/ctdl_build'
-
-# Supervisor
-ADD supervisor.conf /etc/
-ADD citadel-docker-startup.sh /usr/local/bin/
+RUN sh -c '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/tcp
-EXPOSE 80/tcp
-EXPOSE 110/tcp
-EXPOSE 119/tcp
-EXPOSE 143/tcp
-EXPOSE 443/tcp
-EXPOSE 465/tcp
-EXPOSE 504/tcp
-EXPOSE 563/tcp
-EXPOSE 587/tcp
-EXPOSE 993/tcp
-EXPOSE 995/tcp
-EXPOSE 2020/tcp
-EXPOSE 5222/tcp
+EXPOSE 25 80 110 119 143 443 465 504 563 587 993 995 2020 5222
 
-CMD /usr/local/bin/citadel-docker-startup.sh
+# Let's go!
+ENTRYPOINT ["/usr/local/bin/ctdlvisor"]