From bf1552d9a8a1e2481956292998a675d5449315ca Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Wed, 25 May 2022 11:02:33 +0200
Subject: [PATCH] Use busybox as base rather than a completely empty image, for
 convenience

---
 docker/Dockerfile |  4 ++--
 docker/Makefile   | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 02692d8..7cc1939 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM scratch
-COPY ./emptydir /data
+FROM busybox
+RUN mkdir /data
 COPY ./syndicate-server /
 CMD ["/syndicate-server", "-c", "/data"]
diff --git a/docker/Makefile b/docker/Makefile
index fa7fab0..f2be0c8 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,17 +1,18 @@
 all:
 
+.PHONY: all clean image push syndicate-server
+
 clean:
 	rm -f syndicate-server
-	docker rmi syndicate-server
+	docker rmi leastfixedpoint/syndicate-server
 
 image: syndicate-server
-	rm -rf emptydir
-	mkdir emptydir
 	docker build -t leastfixedpoint/$$(./syndicate-server --version | tr ' ' ':') -t leastfixedpoint/syndicate-server:latest .
 
 push: image
 	docker push leastfixedpoint/$$(./syndicate-server --version | tr ' ' ':')
 	docker push leastfixedpoint/syndicate-server:latest
 
-syndicate-server: ../target/x86_64-unknown-linux-musl/release/syndicate-server
-	cp -a $< $@
+syndicate-server:
+	make -C .. x86_64-binary-release
+	cp -a ../target/x86_64-unknown-linux-musl/release/syndicate-server $@