From f8944e3483bb27625c55ac6909b008e842d4675a Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 25 Aug 2021 14:02:37 -0400 Subject: [PATCH] Dockerfile now pulls Citadel code from the Easy Install tarballs instead of git master. --- Dockerfile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index a6d5ebe..77e00aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,31 +26,36 @@ RUN sh -c 'mkdir /tmp/db_build && \ # Deploy "ctdlvisor", a small supervisor program which runs inside the container to wrangle the various services ADD ctdlvisor.c /tmp +# Create our build directory +RUN mkdir /tmp/ctdl_build + # Burn the cache if the upstream repository has changed -ADD "https://code.citadel.org/?p=citadel;a=rss;h=refs/heads/master" /tmp/changes.rss +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 && \ -- 2.30.2