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

[citadel-docker.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index ad5ee2b46ba5a9edae4d1b43f06eb5c34e3e0b71..edd87bc434c4b676728688680b32045416a11929 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 # 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:11-slim
+FROM debian:stable-slim
 
 # All long term persistent data goes here.  Any volume driver may be used.
 VOLUME /citadel-data
@@ -23,31 +23,39 @@ RUN sh -c 'mkdir /tmp/db_build && \
        cd /tmp && \
        rm -fr /tmp/db_build'
 
+# 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
 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/citadel && \
-       cd /tmp/ctdl_build/citadel/libcitadel && \
-       ./bootstrap && \
+       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/citadel && \
-       ./bootstrap && \
+       cd /tmp/ctdl_build/citadel && \
        ./configure && \
        make && \
        make install && \
-       cd /tmp/ctdl_build/citadel/webcit && \
-       ./bootstrap && \
+       cd /tmp/ctdl_build/webcit && \
        ./configure && \
        make && \
        make install && \
-       cd /tmp/ctdl_build/citadel/textclient && \
+       cd /tmp/ctdl_build/textclient && \
        ./bootstrap && \
        ./configure --prefix=/usr --ctdldir=/citadel_data && \
        make && make install && \