From f3300b002c17e9649be8352dfe2c09b1f7a9dec3 Mon Sep 17 00:00:00 2001
From: Ashley Davis <ashley.davis@venafi.com>
Date: Thu, 16 Nov 2023 11:16:08 +0000
Subject: [PATCH] minor tweaks before release of 0.6.0

Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
---
 Dockerfile |  7 +++++--
 Makefile   | 10 +++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ae69a447..d52818ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,9 @@
 # limitations under the License.
 
 # Build the cert-manager-csi-driver binary
-FROM docker.io/library/golang:1.21 as builder
+FROM docker.io/library/golang:1.21-alpine3.18 as builder
+
+RUN apk add make
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -24,11 +26,12 @@ COPY go.sum go.sum
 COPY Makefile Makefile
 COPY cmd/ cmd/
 COPY pkg/ pkg/
+COPY deploy/ deploy/
 
 # Build
 RUN make build
 
-FROM alpine:3.16.2
+FROM docker.io/library/alpine:3.18
 LABEL description="cert-manager CSI Driver"
 
 WORKDIR /
diff --git a/Makefile b/Makefile
index 4fc8e3fa..854697ed 100644
--- a/Makefile
+++ b/Makefile
@@ -63,9 +63,17 @@ helm-docs: $(BINDIR)/helm-docs # verify helm-docs
 # To actually push an image to the public repo, replace the `--output` flag and
 # arguments to `--push`.
 .PHONY: image
-image: ## build cert-manager-csi-driver docker image targeting all supported platforms
+image: ## build cert-manager-csi-driver container image targeting all supported platforms
 	docker buildx build --platform=$(IMAGE_PLATFORMS) -t quay.io/jetstack/cert-manager-csi-driver:$(APP_VERSION) --output type=oci,dest=./bin/cert-manager-csi-driver-oci .
 
+# TODO: ideally we should ensure that image and image-push are identical save for the different output location (or we should use ko instead)
+# for now, we copy+paste the build steps to avoid the need for a manual edit to the Makefile in order to do a release
+# This allows us to release from a non-dirty checkout of a tag.
+
+.PHONY: push
+push: ## build cert-manager-csi-driver container images targeting all supported platforms and push to registry
+	docker buildx build --platform=$(IMAGE_PLATFORMS) -t quay.io/jetstack/cert-manager-csi-driver:$(APP_VERSION) --output push .
+
 .PHONY: e2e
 e2e: depend ## run end to end tests
 	./test/run.sh