From 95c17ea279cff1fa650b3582afa294b056461e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Sun, 5 May 2019 13:18:03 +0200 Subject: [PATCH] Small Makefile refactor --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index dddd8c9..a457be8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f SHELL := /bin/sh -.SHELLFLAGS = -eu -c +.SHELLFLAGS := -eu -c DOCKER := $(shell command -v docker 2>/dev/null) GIT := $(shell command -v git 2>/dev/null) @@ -20,9 +20,10 @@ endif IMAGE_LATEST_TAG := $(IMAGE_NAMESPACE)/$(IMAGE_NAME):latest IMAGE_VERSION_TAG := $(IMAGE_NAMESPACE)/$(IMAGE_NAME):$(IMAGE_VERSION) -IMAGE_DOCKERFILE := ./Dockerfile IMAGE_TARBALL := $(DISTDIR)/$(IMAGE_NAME).tgz +DOCKERFILE := ./Dockerfile + ################################################## ## "all" target ################################################## @@ -37,9 +38,9 @@ all: save-image .PHONY: build-image build-image: '$(DOCKER)' build \ - --tag '$(IMAGE_LATEST_TAG)' \ --tag '$(IMAGE_VERSION_TAG)' \ - --file '$(IMAGE_DOCKERFILE)' ./ + --tag '$(IMAGE_LATEST_TAG)' \ + --file '$(DOCKERFILE)' ./ ################################################## ## "save-*" targets