Iwan/baseimage-docker_fr
1
0
Fork 0
forked from Docker/baseimage-docker
Code Issues Pull Requests Releases Wiki Activity

if both NAME and BASE_IMAGE are defined, don't append variant to baseimage

Browse Source
This commit is contained in:
Matyas Markovics
2019-03-13 01:00:13 +01:00
parent 4f65f0a270
commit 089258a746
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -1,11 +1,11 @@
NAME ?= phusion/baseimage ifndef BASE_IMAGE
VERSION ?= 0.11
ifeq ($(origin BASE_IMAGE), undefined)
BASE_IMAGE = ubuntu:18.04 BASE_IMAGE = ubuntu:18.04
NAME ?= phusion/baseimage
else ifdef NAME
else else
NAME := $(NAME)-$(subst :,-,${BASE_IMAGE}) NAME = phusion/baseimage-$(subst :,-,${BASE_IMAGE})
endif endif
VERSION ?= 0.11
.PHONY: all build test tag_latest release ssh .PHONY: all build test tag_latest release ssh