smallbuild replaced with individual flags

[citadel-docker.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 0db03ed2618a30c6275289dd04a92f0dccfbe241..d79953459d378ecd1de0e4ff5a044bf4d88e07bf 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Dockerfile for Citadel
 #
-# Copyright (c) 2019-2022 by the citadel.org team
+# Copyright (c) 2019-2023 by the citadel.org team
 #
 # This program is open source software.  Use, duplication, or disclosure
 # is subject to the terms of the GNU General Public License, version 3.
@@ -28,15 +28,23 @@ RUN apt -y install gcc bison make zlib1g-dev libldap2-dev libssl-dev gettext lib
 
 # Build our own local copy of Berkeley DB, because the one included with the system libs is too old.
 # We will install it to /usr/local and carry it over to the second stage build.
-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 --disable-static --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'
+# build and install Berkeley DB
+RUN sh -c 'mkdir /tmp/db_build'
+RUN sh -c 'cd /tmp/db_build && curl -k https://easyinstall.citadel.org/db-18.1.40.tar.gz | tar xvzf -'
+RUN sh -c '\
+       cd /tmp/db_build/db-18.1.40/build_unix && \
+       ../dist/configure --prefix=/usr/local \
+               --with-cryptography=no --disable-hash --disable-heap --disable-queue \
+               --disable-replication --disable-statistics \
+               --with-uniquename=_ctdl \
+               --enable-static --disable-shared \
+               --disable-compat185 --disable-cxx --disable-debug \
+               --disable-dump185 --disable-java --disable-tcl --disable-test --without-rpm'
+RUN sh -c 'cd /tmp/db_build/db-18.1.40/build_unix && make -j`cat /proc/cpuinfo  | grep processor | wc -l`'
+RUN sh -c 'cd /tmp/db_build/db-18.1.40/build_unix && make install_lib'
+RUN sh -c 'cd /tmp/db_build/db-18.1.40/build_unix && make install_include'
+RUN sh -c 'cd /tmp/db_build/db-18.1.40/build_unix && make install_utilities'
+RUN sh -c 'rm -fr /tmp/db_build'
 
 # Create our build directory
 RUN mkdir /tmp/ctdl_build
@@ -51,7 +59,7 @@ RUN sh -c '\
 # Grab the repository at the specified branch or tag.  If there wasn't any change we should enjoy the cache.
 RUN sh -c '\
        cd /tmp/ctdl_build && \
-       git clone -b $branch --single-branch git://git.citadel.org/citadel'
+       git clone -b $branch --single-branch https://code.citadel.org/citadel/citadel.git'
 
 # Build libcitadel
 RUN sh -c '\
@@ -86,7 +94,7 @@ RUN sh -c '\
        export CFLAGS=-I/usr/local/include && \
        export LDFLAGS=-L/usr/local/lib && \
        cd /tmp/ctdl_build/citadel/textclient && \
-       ./configure --prefix=/usr --ctdldir=/citadel_data && \
+       ./configure --prefix=/usr/local --ctdldir=/citadel_data && \
        make && make install && \
        cd /tmp && \
        rm -vfr /tmp/ctdl_build && \
@@ -109,7 +117,7 @@ COPY --from=build-stage /usr/local/ /usr/local/
 RUN ldconfig -v
 
 # Ports
-EXPOSE 25 80 110 119 143 443 465 504 563 587 993 995 2020 5222
+EXPOSE 25 80 110 119 143 443 465 504 563 587 993 995 5222
 
 # Let's go!
 ENTRYPOINT ["/usr/local/bin/ctdlvisor"]