From 1b4f5d412e05de2938c8ebbcff955e654abd9018 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 18 Sep 2018 08:25:04 -0700 Subject: [PATCH] Make base for Dockerfile.engine-dm configurable Signed-off-by: Eli Uriegas (cherry picked from commit 605df1abcb4c432ebb1b73c29bfa0d5d3d48c0ce) Signed-off-by: Eli Uriegas Upstream-commit: 7df6db6ac3b71c0a41fc2792e5778e2566b72399 Component: packaging --- components/packaging/image/Dockerfile.engine-dm | 3 ++- components/packaging/image/Makefile | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/components/packaging/image/Dockerfile.engine-dm b/components/packaging/image/Dockerfile.engine-dm index 6c71afe900..3c9442a679 100644 --- a/components/packaging/image/Dockerfile.engine-dm +++ b/components/packaging/image/Dockerfile.engine-dm @@ -1,8 +1,9 @@ # Common builder ARG GO_IMAGE +ARG BASE_IMAGE=centos:7 FROM ${GO_IMAGE} as golang -FROM centos:7 as builder +FROM ${BASE_IMAGE} as builder ENV GOPATH=/go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin ENV AUTO_GOPATH 1 diff --git a/components/packaging/image/Makefile b/components/packaging/image/Makefile index 7f820f9995..499ad5804a 100644 --- a/components/packaging/image/Makefile +++ b/components/packaging/image/Makefile @@ -13,7 +13,12 @@ CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown DEFAULT_PRODUCT_LICENSE?=Community Engine PLATFORM?=Docker Engine - Community IMAGE_WITH_TAG=$(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION) -IMAGE_BUILD=docker build -t $(IMAGE_WITH_TAG) \ +ifdef BASE_IMAGE + # TODO: Clean this up to only set ENGINE_GO_IMAGE + BASE_IMAGE_FLAG=--build-arg BASE_IMAGE=$(BASE_IMAGE) + ENGINE_GO_IMAGE=$(BASE_IMAGE) +endif +IMAGE_BUILD?=docker build -t $(IMAGE_WITH_TAG) \ --build-arg GO_IMAGE="$(ENGINE_GO_IMAGE)" \ --build-arg VERSION="$(STATIC_VERSION)" \ --build-arg GITCOMMIT="$$(cd $(ENGINE_DIR) && git rev-parse --short=7 HEAD)" \ @@ -21,6 +26,7 @@ IMAGE_BUILD=docker build -t $(IMAGE_WITH_TAG) \ --build-arg PLATFORM="$(PLATFORM)" \ --build-arg PRODUCT="$(PRODUCT)" \ --build-arg DEFAULT_PRODUCT_LICENSE="$(DEFAULT_PRODUCT_LICENSE)" \ + $(BASE_IMAGE_FLAG) \ --file $< $(ENGINE_DIR) .PHONY: help