From 0aad0eb7b47e5896010c5a556f16b06b914ab23c Mon Sep 17 00:00:00 2001 From: Andrew Rynhard Date: Thu, 29 Nov 2018 20:45:45 -0800 Subject: [PATCH] chore: fix image push --- .dockerignore | 8 -------- Makefile | 4 +++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.dockerignore b/.dockerignore index 8fdcba38..e69de29b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,8 +0,0 @@ -* -!cmd -!go.mod -!go.sum -!hack -!main.go -!pkg -!scripts diff --git a/Makefile b/Makefile index df9b54f1..17b5d198 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ AUTH_CONFIG ?= $(HOME)/.kaniko/config.json SHA := $(shell gitmeta git sha) TAG := $(shell gitmeta image tag) BUILT := $(shell gitmeta built) +PUSH := $(shell gitmeta image pushable --negate) EXECUTOR_ARGS := --context=/workspace --cache=true --cache-dir=/cache --cleanup EXECUTOR_VOLUMES := --volume $(AUTH_CONFIG):/kaniko/.docker/config.json:ro --volume $(PWD)/cache:/cache --volume $(PWD)/build:/build @@ -28,8 +29,9 @@ conform: cache --dockerfile=Dockerfile \ --cache-repo=$(REPO)/$@ \ --destination=$(REPO)/$@:$(TAG) \ + --destination=$(REPO)/$@:latest \ --single-snapshot \ - --no-push \ + --no-push=$(PUSH) \ --build-arg GOLANG_IMAGE=$(GOLANG_IMAGE) \ --build-arg SHA=$(SHA) \ --build-arg TAG=$(TAG) \