From d0f07a27c9583b6618adcda6d7e2c4e8002846eb Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 20 Jun 2023 18:51:09 -0400 Subject: [PATCH] Upgrade Berkeley DB to 18.1.40 --- Dockerfile | 25 ++++++++++++++++--------- README.txt | 2 +- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index a6f8dcc..a6fbe52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,15 +28,22 @@ 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 \ + --enable-smallbuild \ + --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 diff --git a/README.txt b/README.txt index e98e016..77c2487 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ This directory contains the tooling necessary to build an OCI compatible container of the Citadel System using Docker. -Copyright (c) 2019-2022 by Art Cancro +Copyright (c) 2019-2023 by Art Cancro This program is open source software, distributed under the terms of the GNU General Public License, version 3. It runs -- 2.30.2