From 967ed28f5a3cbd4701fc93538435367eaef74621 Mon Sep 17 00:00:00 2001 From: tshak Date: Tue, 11 Feb 2020 18:50:04 +0100 Subject: [PATCH] Update .dockerignore and docker build --- .dockerignore | 2 ++ Makefile | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index 9414382..7b00c7e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,3 @@ Dockerfile +.git +PROJECT \ No newline at end of file diff --git a/Makefile b/Makefile index 9dddf74..770020f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -IMG ?= riserplatform/riser-controller:latest +IMG ?= riserplatform/riser-controller +TAG ?= latest SDKVERSION ?= latest # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) @@ -44,11 +45,11 @@ generate: controller-gen # Build the docker image docker-build: - docker build . -t ${IMG} + docker build . -t ${IMG}:${TAG} # Push the docker image docker-push: - docker push ${IMG} + docker push ${IMG}:${TAG} # find or download controller-gen # download controller-gen if necessary