From 2baf503a2a535d29183454913deba5dff8365625 Mon Sep 17 00:00:00 2001 From: jalr Date: Tue, 20 Feb 2018 23:17:44 +0100 Subject: [PATCH] Allow override of image names by environment variables --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 153c8d1..c7bbaa0 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ PACKER_VERSION ?= 1.2.0 ANNOUNCE ?= http://10.2.2.1:6969/announce WEBSEED ?= http://10.2.2.1 -PACKER_DOCKER_IMAGE = labsync-packer -MKTORRENT_DOCKER_IMAGE = labsync-mktorrent +PACKER_DOCKER_IMAGE ?= labsync-packer +MKTORRENT_DOCKER_IMAGE ?= labsync-mktorrent .PHONY: clean clean: @@ -15,7 +15,7 @@ dockerimg: docker build -t "$(PACKER_DOCKER_IMAGE)" --build-arg "PACKER_VERSION=$(PACKER_VERSION)" packer/docker docker build -t "$(MKTORRENT_DOCKER_IMAGE)" mktorrent -images/debian-stretch: dockerimg +images/debian-stretch: docker run \ -ti \ --rm \ @@ -28,7 +28,7 @@ images/debian-stretch: dockerimg debian-stretch #images/debian-stretch.squashfs -images/debian-stretch.torrent: dockerimg +images/debian-stretch.torrent: docker run \ -ti \ --rm \