From a83999d6ed5d0323f7070d976fcaaebbe11d88bc Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 5 Oct 2023 09:53:53 +0200 Subject: [PATCH] Build each docker image with a separate target directory, because it turns out they seem to pollute each other if they all share one! --- docker/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 187712d..4bd0668 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -10,6 +10,7 @@ all: clean: rm -f syndicate-server.* + rm -rf $(patsubst %,target.%,$(ARCHITECTURES)) -podman images -q $(U)/$(I) | sort -u | xargs podman rmi -f image: $(SERVERS) @@ -33,5 +34,5 @@ push-only: podman manifest push $(U)/$(I):latest syndicate-server.%: - make -C .. $$(./alpine-architecture $*)-binary-release - cp -a ../target/$$(./alpine-architecture $*)-unknown-linux-musl*/release/syndicate-server $@ + make -C .. CARGO_TARGET_DIR=docker/target.$* $$(./alpine-architecture $*)-binary-release + cp -a target.$*/$$(./alpine-architecture $*)-unknown-linux-musl*/release/syndicate-server $@