airship/kubernetes-entrypoint
Code Issues Proposed changes

Merge "Grant access to docker build-args from Makefile"

Browse Source
This commit is contained in:
Zuul
2019-11-13 19:49:07 +00:00
committed by Gerrit Code Review
parent 880c42bfe0 946316faa9
commit a59b821ac9
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@@ -5,13 +5,15 @@ LINTER_CMD := "github.com/golangci/golangci-lint/cmd/golangci-lint" run
LINTER_CONFIG := .golangci.yaml LINTER_CONFIG := .golangci.yaml
# docker image options # docker image options
DOCKER_REGISTRY ?= quay.io DOCKER_REGISTRY ?= quay.io
DOCKER_IMAGE_NAME ?= kubernetes-entrypoint DOCKER_IMAGE_NAME ?= kubernetes-entrypoint
DOCKER_IMAGE_PREFIX ?= airshipit DOCKER_IMAGE_PREFIX ?= airshipit
DOCKER_IMAGE_TAG ?= dev DOCKER_IMAGE_TAG ?= dev
DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_PREFIX)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_PREFIX)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
DOCKER_MAKE_TARGET := build DOCKER_MAKE_TARGET := build
DOCKER_TARGET_STAGE ?= release DOCKER_TARGET_STAGE ?= release
DOCKER_BASE_IMAGE ?= docker.io/golang:1.12.6-stretch
DOCKER_RELEASE_IMAGE ?= scratch
PKG := ./... PKG := ./...
TESTS := . TESTS := .
@@ -27,7 +29,10 @@ lint:
.PHONY: docker-image .PHONY: docker-image
docker-image: docker-image:
@docker build . --build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) --tag $(DOCKER_IMAGE) --target $(DOCKER_TARGET_STAGE) @docker build . --tag $(DOCKER_IMAGE) --target $(DOCKER_TARGET_STAGE) \
--build-arg MAKE_TARGET=$(DOCKER_MAKE_TARGET) \
--build-arg GO_IMAGE=$(DOCKER_BASE_IMAGE) \
--build-arg RELEASE_IMAGE=$(DOCKER_RELEASE_IMAGE)
.PHONY: docker-image-unit-tests .PHONY: docker-image-unit-tests
docker-image-unit-tests: DOCKER_MAKE_TARGET = unit-tests docker-image-unit-tests: DOCKER_MAKE_TARGET = unit-tests