From 39e17d43cd9334a41b5c97f6c81c3ff6296dfbb5 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Wed, 9 Jan 2019 12:48:06 +0100 Subject: [PATCH] use current .docker dir if present --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 72f563d22..337ef57ac 100644 --- a/Makefile +++ b/Makefile @@ -5,13 +5,19 @@ IMAGE_TEST := reconcile-test IMAGE_NAME := quay.io/app-sre/qontract-reconcile IMAGE_TAG := $(shell git rev-parse --short=7 HEAD) +ifneq (,$(wildcard $(CURDIR)/.docker)) + DOCKER_CONF := $(CURDIR)/.docker +else + DOCKER_CONF := $(HOME)/.docker +endif + build: @docker build -t $(IMAGE_NAME):latest -f dockerfiles/Dockerfile . @docker tag $(IMAGE_NAME):latest $(IMAGE_NAME):$(IMAGE_TAG) push: - @docker push $(IMAGE_NAME):latest - @docker push $(IMAGE_NAME):$(IMAGE_TAG) + @docker --config=$(DOCKER_CONF) push $(IMAGE_NAME):latest + @docker --config=$(DOCKER_CONF) push $(IMAGE_NAME):$(IMAGE_TAG) build-test: @docker build -t $(IMAGE_TEST) -f dockerfiles/Dockerfile.test .