From 6bcc7e0fc1514d532fe9c7420c89fbf92144e7a3 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 17 Nov 2022 11:24:04 +0100
Subject: [PATCH] Thu 17 Nov 2022 11:24:04 AM CET

---
 assets/setup-rust.sh         |  9 +++++++++
 linux-base/Makefile          |  2 +-
 linux-base/assets/Dockerfile | 11 ++++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100755 assets/setup-rust.sh

diff --git a/assets/setup-rust.sh b/assets/setup-rust.sh
new file mode 100755
index 0000000..c27757f
--- /dev/null
+++ b/assets/setup-rust.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+tmpfile=/tmp/tmp.784979489.sh
+
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > $tmpfile
+chmod +x $tmpfile
+/bin/sh -c "$tmpfile -y"
+rm -f $tmpfile
diff --git a/linux-base/Makefile b/linux-base/Makefile
index 25ac840..9849c35 100644
--- a/linux-base/Makefile
+++ b/linux-base/Makefile
@@ -119,7 +119,7 @@ librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz
 
 
 docker-build :
-	docker build --build-arg "arch=$(arch)" -t $(docker_image_name) - < assets/Dockerfile
+	docker build --no-cache --build-arg "arch=$(arch)" -t $(docker_image_name) - < assets/Dockerfile
 
 docker-run :
 	docker run --rm $(docker_image_name) sh -c "git pull && make fetch && make arch=$(arch) all"
diff --git a/linux-base/assets/Dockerfile b/linux-base/assets/Dockerfile
index d339acc..2d822e0 100644
--- a/linux-base/assets/Dockerfile
+++ b/linux-base/assets/Dockerfile
@@ -12,10 +12,11 @@ RUN git checkout flatpak
 WORKDIR linux-base
 ENV PATH="${PATH}:/root/.cargo/bin"
 
-RUN ( make setup-debian && \
- make fetch && \
- ( make arch=$arch bootstrap ; true ) && \
- make arch=$arch bootstrap && \
- make veryclean )
 
 #RUN make setup-fedora && make fetch && make arch=$arch bootstrap && make veryclean
+RUN make setup-debian
+RUN make update # this makes it not reproducible
+RUN make fetch
+RUN sh -c ./assets/setup-rust.sh
+RUN make arch=$arch bootstrap
+RUN make veryclean