From 4fa6b4260a68a584ee009222741e37e733c2bcd1 Mon Sep 17 00:00:00 2001
From: "jacob.eva" <x00010@disroot.org>
Date: Thu, 12 Sep 2024 14:03:25 +0100
Subject: [PATCH] Update build

---
 Dockerfile | 20 ++++++++++++++------
 Makefile   |  9 ++++++---
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 52f1dca..a1073ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,9 +15,15 @@ COPY ./ Sideband/
 COPY  docker/init.gradle .gradle/
 
 # Clone required repos
-RUN git clone https://github.com/markqvist/Reticulum \
+RUN git clone https://github.com/jacobeva/Reticulum \
     && git clone https://github.com/markqvist/LXMF 
 
+# Switch branches
+WORKDIR "Reticulum"
+RUN git switch ble-dev
+
+WORKDIR ".."
+
 # Fetch files required for sideband local repository
 
 RUN mkdir dist_archive 
@@ -41,13 +47,15 @@ RUN export VERSION=$(wget -qO - https://api.github.com/repos/markqvist/RNode_Fir
     | tr -d \", | wget -qi - -O RNode_Firmware_${VERSION}_Source.zip 
 
 # Get source for reticulum.network and unsigned.io sites
-RUN git clone https://github.com/markqvist/reticulum_website reticulum.network \
-    && cp reticulum.network/docs/manual/Reticulum\ Manual.pdf . \
-    && cp reticulum.network/docs/manual/Reticulum\ Manual.epub . 
+RUN wget -q https://github.com/markqvist/reticulum_website/archive/refs/heads/main.zip \
+    && unzip main.zip "reticulum_website-main/docs/*" \
+    && cp -r reticulum_website-main/docs reticulum.network && rm -r reticulum_website-main \
+    && cp reticulum.network/manual/Reticulum\ Manual.pdf . \
+    && cp reticulum.network/manual/Reticulum\ Manual.epub . 
 
 # A mirror can also be accessed at https://liberatedsystems.co.uk/unsigned_io_archive.zip if unsigned.io is down!
-RUN wget -q https://unsigned.io/unsigned_io_archive.zip \ 
-    && unzip -q unsigned_io_archive.zip -d unsigned.io  && rm unsigned_io_archive.zip 
+RUN wget -q https://liberatedsystems.co.uk/unsigned_io_archive.zip \ 
+    && unzip -q unsigned_io_archive.zip && rm unsigned_io_archive.zip 
 
 
 WORKDIR "../Sideband/sbapp"
diff --git a/Makefile b/Makefile
index 63a0378..033277d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ console:
 clean:
 	@echo Cleaning...
 	-rm -r ./build
-	-rm -r ./dist
+	-rm -rf ./dist
 
 cleanbuildozer:
 	make -C sbapp cleanall
@@ -34,9 +34,12 @@ build_wheel:
 release: build_wheel apk fetchapk
 
 release_docker:
-	-mkdir -p ./dist
 	@echo If you experience errors, please ensure you have docker-buildx installed on your system.
-	sudo docker build --target=artifact --output type=local,dest=./dist/ .
+	@echo This target uses a custom buildkit image to allow for full viewing of the logs on build, but takes slightly longer as a result.
+	-mkdir -p ./dist
+	# Needed for allowing the viewing of the full log
+	-sudo docker buildx create --bootstrap --use --name buildkit --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=-1 --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=-1 &> /dev/null
+	sudo docker buildx build --target=artifact --output type=local,dest=./dist/ .
 	@echo Build successful. APK copied to ./dist directory.
 	$(MAKE) sign_release