From 089258a7463b1d4c6fb605db8c651b2bd9f80875 Mon Sep 17 00:00:00 2001
From: Matyas Markovics <matyas@scrapinghub.com>
Date: Wed, 13 Mar 2019 01:00:13 +0100
Subject: [PATCH] if both NAME and BASE_IMAGE are defined, don't append variant
 to baseimage

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 0913ad8..732707b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-NAME ?= phusion/baseimage
-VERSION ?= 0.11
-
-ifeq ($(origin BASE_IMAGE), undefined)
-BASE_IMAGE = ubuntu:18.04
+ifndef BASE_IMAGE
+	BASE_IMAGE = ubuntu:18.04
+	NAME ?= phusion/baseimage
+else ifdef NAME
 else
-NAME := $(NAME)-$(subst :,-,${BASE_IMAGE})
+	NAME = phusion/baseimage-$(subst :,-,${BASE_IMAGE})
 endif
+VERSION ?= 0.11
 
 
 .PHONY: all build test tag_latest release ssh