From 8ab229e639aa73fadd9460d86e4900ec38aa67a5 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 8 Feb 2022 10:39:13 +0100
Subject: [PATCH] changed version ENV statements into ARG statements

---
 assets/linux.Dockerfile | 4 ++--
 assets/linux.mk         | 2 +-
 assets/macos.Dockerfile | 4 ++--
 assets/macos.mk         | 6 ++++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/assets/linux.Dockerfile b/assets/linux.Dockerfile
index 3ae3618..501d8fd 100644
--- a/assets/linux.Dockerfile
+++ b/assets/linux.Dockerfile
@@ -1,8 +1,8 @@
 ARG distro
 FROM $distro
 
-ENV version          96.0.3
-ENV source_release   6
+ARG version=error
+ARG source_release=error
 
 # we use this wasi version
 ENV wasi_fullversion 14.0
diff --git a/assets/linux.mk b/assets/linux.mk
index 8d3187a..d9694bc 100644
--- a/assets/linux.mk
+++ b/assets/linux.mk
@@ -13,7 +13,7 @@ use_docker=true
 outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
 
 docker :
-	docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile
+	docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile
 
 build : $(outfile) $(outfile).sha256sum
 
diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile
index 6b1f8ea..694d9b4 100644
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@@ -5,8 +5,8 @@ FROM debian:bullseye
 ARG arch=error
 
 # version of librewolf we use to bootstrap (does not need to be recent)
-ENV version          96.0.3
-ENV source_release   6
+ARG version=error
+ARG source_release=error
 
 # we use this wasi version
 ENV wasi_fullversion 14.0
diff --git a/assets/macos.mk b/assets/macos.mk
index 797693b..7f9c318 100644
--- a/assets/macos.mk
+++ b/assets/macos.mk
@@ -12,9 +12,11 @@ use_docker=true
 outfile=librewolf-$(version)-$(source_release).en-US.mac.$(arch).dmg
 
 docker :
-	docker build --build-arg "arch=$(arch)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile
+	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile
 
-build :
+build : $(outfile) $(outfile).sha256sum
+
+$(outfile) $(outfile).sha256sum :
 	sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig
 	if [ $(use_docker) = true ]; then \
 		docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" ; \