Fix for building any version from the Makefile

Author: lee-b

.gitignore

@@ -1,5 +1,5 @@
 .vscode/
-.image
+.image-*
 dist/
 build/
 *~

Dockerfile

@@ -1,9 +1,12 @@
 FROM rust as build
 
+ARG PIJUL_VERSION
+ENV PIJUL_VERSION $PIJUL_VERSION
+
 RUN apt-get update && apt-get upgrade -y
 RUN apt-get install -y libsodium-dev libc-dev
 
-RUN cargo install pijul --version "~1.0.0-alpha" --root /usr/local --features git
+RUN cargo install pijul --version "~1.0.0-$PIJUL_VERSION" --root /usr/local --features git
 RUN strip /usr/local/bin/pijul
 
 #######################################################

Makefile

@@ -1,35 +1,35 @@
 ARCH=$(shell uname -m)
-VERSION=1.0.0-alpha
+VERSION=1.0.0-beta
 
 TAG=${ARCH}-${VERSION}
 
 all: dist/pijul-${TAG} dist/pijul-bootstrap-${TAG}.tar.gz
 
-dist/pijul dist/pijul-${TAG} dist/pijul-${TAG}.tar : .image build/pijul-${TAG}
+dist/pijul dist/pijul-${TAG} dist/pijul-${TAG}.tar : .image-${TAG} build/pijul-${TAG}
 	rm -rf dist
 	mkdir dist
 	cp build/pijul-${TAG} dist/pijul-${TAG}
 	rm -rf build
 	docker save -o dist/pijul-bootstrap-${TAG}.tar pijul-bootstrap:${TAG}
 	gzip dist/pijul-bootstrap-${TAG}.tar
 
-build/pijul-${TAG}: .image
+build/pijul-${TAG}: .image-${TAG}
 	rm -rf build && mkdir -p build
 	docker run -v "$(PWD)/build:/build:rw" --entrypoint /bin/cp pijul-bootstrap:${TAG} /usr/local/bin/pijul /build/pijul-${TAG}
 
-.image: Dockerfile
-	docker build -t pijul-bootstrap:${TAG} .
+.image-${TAG}: Dockerfile
+	docker build --build-arg "PIJUL_VERSION=${VERSION}" -t pijul-bootstrap:${TAG} .
 	docker tag pijul-bootstrap:${TAG} pijul-bootstrap:latest
-	touch .image
+	touch .image-${TAG}
 
-run: .image
+run: .image-${TAG}
 	docker run -ti pijul-bootstrap:${TAG} pijul
 
 clean:
-	rm -rf dist build .image
+	rm -rf dist build .image-*
 
 # developers only
-publish: .image ./publish.sh
+publish: .image-${TAG} ./publish.sh
 	./publish.sh "${TAG}"
 
 .PHONY: dist