Dockerfile now pulls Citadel code from the Easy Install tarballs instead of git master.

diff --git a/Dockerfile b/Dockerfile
index a6d5ebe97edbb978638f8df8ccc082ea764d03bb..77e00aa79f761757f5bb82a97c444e5dcf2de11a 100644 (file)
--- 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 && \