Added [-x log_level] to ctdlvisor, this gets passed to citserver and webcit

[citadel-docker.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 71bb53660eb225dfd37c6e314486d0f821f7ff94..edd87bc434c4b676728688680b32045416a11929 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,41 +1,73 @@
-FROM bitnami/minideb:latest
+# Dockerfile for Citadel
 
+# This container is built on MiniDeb, a stripped down version of Debian for use in containers.
+# Rehosting on another base Linux image is not expected to create compatibility issues.
+FROM debian:stable-slim
+
+# All long term persistent data goes here.  Any volume driver may be used.
 VOLUME /citadel-data
 
+RUN apt -y update
+
 # 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 apt -y install gcc bison 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'
+# Create our build directory
+RUN mkdir /tmp/ctdl_build
+
+# Deploy "ctdlvisor", a small supervisor program which runs inside the container to wrangle the various services
+ADD ctdlvisor.c /tmp
+
+# Burn the cache if the upstream repository has changed
+ADD "https://easyinstall.citadel.org/libcitadel-easyinstall.tar.gz" /tmp/ctdl_build
+ADD "https://easyinstall.citadel.org/citadel-easyinstall.tar.gz" /tmp/ctdl_build
+ADD "https://easyinstall.citadel.org/webcit-easyinstall.tar.gz" /tmp/ctdl_build
+ADD "https://easyinstall.citadel.org/textclient-easyinstall.tar.gz" /tmp/ctdl_build
 
 # 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'
-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 'export CFLAGS=-I/usr/local/ctdlsupport/include && \
+       export LDFLAGS="-L/usr/local/ctdlsupport/lib -Wl,--rpath -Wl,/usr/local/ctdlsupport/lib" && \
+       cd /tmp/ctdl_build && \
+       tar xvzf libcitadel-easyinstall.tar.gz && \
+       tar xvzf citadel-easyinstall.tar.gz && \
+       tar xvzf webcit-easyinstall.tar.gz && \
+       tar xvzf textclient-easyinstall.tar.gz && \
+       cd /tmp/ctdl_build/libcitadel && \
+       ./configure --prefix=/usr && \
+       make && \
+       make install && \
+       cd /tmp/ctdl_build/citadel && \
+       ./configure && \
+       make && \
+       make install && \
+       cd /tmp/ctdl_build/webcit && \
+       ./configure && \
+       make && \
+       make install && \
+       cd /tmp/ctdl_build/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
-
-CMD /usr/local/bin/citadel-docker-startup.sh
+EXPOSE 25 80 110 119 143 443 465 504 563 587 993 995 2020 5222
+
+# Let's go!
+ENTRYPOINT ["/usr/local/bin/ctdlvisor"]