From 39cb28f4f6ea56dfbbaa5e9b41f38c8631c963bd Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 11 May 2022 12:00:53 +0200
Subject: [PATCH] ci: Integrate ci-tools-lib

---
 Dockerfile |  4 ++--
 Makefile   | 26 +++-----------------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8e2e6e2..0d55b29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-ARG ALPINE_VERSION
+ARG ALPINE_VERSION=3.15
 
 FROM alpine:${ALPINE_VERSION}
 
 ARG ALPINE_VERSION
-ARG KUBE_VERSION
+ARG KUBE_VERSION=1.22
 
 RUN cd /etc/apk/keys && \
     wget "https://cdn.zero-downtime.net/alpine/stefan@zero-downtime.net-61bb6bfb.rsa.pub" && \
diff --git a/Makefile b/Makefile
index 7c84e43..77e1c10 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,8 @@
-VERSION ?= 1.22.8
-ALPINE_VERSION ?= 3.15
 REGISTRY := public.ecr.aws/zero-downtime
-REPOSITORY := kubezero-admin
-TAG := $(REPOSITORY):v$(VERSION)
-KUBE_VERSION := $(shell echo $(VERSION) | sed -e 's/\.[[:digit:]]*$$//')
+IMAGE := kubezero-admin
+REGION := us-east-1
 
-.PHONY: build push clean scan
-
-all: build push
-
-build:
-	podman build --rm --build-arg KUBE_VERSION=$(KUBE_VERSION) --build-arg ALPINE_VERSION=$(ALPINE_VERSION) -t $(TAG) .
-
-push:
-	aws ecr-public get-login-password --region us-east-1 | podman login --username AWS --password-stdin $(REGISTRY)
-	podman tag $(TAG) $(REGISTRY)/$(TAG)
-	podman push $(REGISTRY)/$(TAG)
-
-clean:
-	podman image prune -f
-
-scan:
-	podman system service&
-	sleep 5; trivy $(TAG)
+include .ci/podman.mk
 
 update-charts:
 	./scripts/update_helm.sh