Allow override of image names by environment variables

This commit is contained in:
jalr 2018-02-20 23:17:44 +01:00
parent 47fb326aa1
commit 2baf503a2a

View file

@ -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 \