Changed the container base OS from debian:11-slim to debian:stable-slim

[citadel-docker.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index cf9baea3d997f6ed8ccd4645877541d54000e7bb..7f9cd25f0505c307974ae448931b3f3777af45af 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,37 @@
 # Dockerfile for Citadel
 
-FROM bitnami/minideb:latest
+# 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 libreadline-dev
+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'
 
 # Deploy "ctdlvisor", a small supervisor program which runs inside the container to wrangle the various services
 ADD ctdlvisor.c /tmp
 
 # Download and build Citadel
-RUN sh -c 'mkdir /tmp/ctdl_build && \
+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 && \
+       git clone git://git.citadel.org/citadel && \
        cd /tmp/ctdl_build/citadel/libcitadel && \
        ./bootstrap && \
        ./configure --prefix=/usr && \