X-Git-Url: https://code.citadel.org/?p=citadel-docker.git;a=blobdiff_plain;f=Dockerfile;fp=Dockerfile;h=02015b2fd3306dd4e166d484e01966afda8c9241;hp=cf9baea3d997f6ed8ccd4645877541d54000e7bb;hb=122893669b8b53e19775f79e11c3ac37af8f4062;hpb=b9994af643b6329f691d55290f5d9443674131ef

diff --git a/Dockerfile b/Dockerfile
index cf9baea..02015b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,13 +5,26 @@ 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 libreadline-dev
+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'
 
 # 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 && \
 	cd /tmp/ctdl_build/citadel/libcitadel && \