From 3c9a0ec9cba4154db087cda291251fa6fd350abb Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sun, 17 Sep 2023 21:05:23 -0400
Subject: [PATCH] Build from the published sources, not from git

---
 Dockerfile | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d799534..a726bcb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,6 @@
 # The first stage build will bring in all of our development tools.
 FROM debian:bullseye-slim AS build-stage
 
-# The "branch" argument specifies the branch or tag from which we will build.
-ARG branch=master
-
 # All long term persistent data goes here.  Any volume driver may be used.
 VOLUME /citadel-data
 
@@ -56,15 +53,15 @@ RUN sh -c '\
 	cc ctdlvisor.c -o /usr/local/bin/ctdlvisor && \
 	rm -vf /tmp/ctdlvisor.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 https://code.citadel.org/citadel/citadel.git'
+# Download the latest Citadel code
+RUN curl https://easyinstall.citadel.org/libcitadel-easyinstall.tar.gz | tar xvzf -
+RUN curl https://easyinstall.citadel.org/citadel-easyinstall.tar.gz | tar xvzf -
+RUN curl https://easyinstall.citadel.org/webcit-easyinstall.tar.gz | tar xvzf -
+RUN curl https://easyinstall.citadel.org/textclient-easyinstall.tar.gz | tar xvzf -
 
 # Build libcitadel
 RUN sh -c '\
-	cd /tmp/ctdl_build/citadel/libcitadel && \
-	./bootstrap && \
+	cd libcitadel && \
 	./configure --prefix=/usr/local && \
 	make && \
 	make install'
@@ -73,8 +70,7 @@ RUN sh -c '\
 RUN sh -c '\
 	export CFLAGS=-I/usr/local/include && \
 	export LDFLAGS=-L/usr/local/lib && \
-	cd /tmp/ctdl_build/citadel/citadel && \
-	./bootstrap && \
+	cd citadel && \
 	./configure && \
 	make && \
 	make install'
@@ -83,8 +79,7 @@ RUN sh -c '\
 RUN sh -c '\
 	export CFLAGS=-I/usr/local/include && \
 	export LDFLAGS=-L/usr/local/lib && \
-	cd /tmp/ctdl_build/citadel/webcit && \
-	./bootstrap && \
+	cd webcit && \
 	./configure && \
 	make && \
 	make install'
@@ -93,11 +88,11 @@ RUN sh -c '\
 RUN sh -c '\
 	export CFLAGS=-I/usr/local/include && \
 	export LDFLAGS=-L/usr/local/lib && \
-	cd /tmp/ctdl_build/citadel/textclient && \
+	cd textclient && \
 	./configure --prefix=/usr/local --ctdldir=/citadel_data && \
-	make && make install && \
-	cd /tmp && \
-	rm -vfr /tmp/ctdl_build && \
+	make && \
+	cp citadel /usr/local/bin && \
+	cp citadel.rc /usr/local/etc && \
 	rm -vrf /usr/local/citadel/data /usr/local/citadel/files /usr/local/citadel/keys /usr/local/webcit/keys'
 
 ####################################################################################################
-- 
2.30.2