From b5fad3b887e13b26074425755469f1aaeb4f8705 Mon Sep 17 00:00:00 2001 From: Tomas Nozicka Date: Thu, 22 Jun 2023 15:20:11 +0200 Subject: [PATCH] Add podman to kube-tools --- Makefile | 2 +- kube-tools/latest/Dockerfile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0bf28b1..1ef5159 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ build: $(call build-image,./golang/1.18,$(REPO):golang-1.18,$(REPO):base-ubuntu-22.04) $(call build-image,./golang/1.19,$(REPO):golang-1.19,$(REPO):base-ubuntu-22.04) $(call build-image,./golang/1.20,$(REPO):golang-1.20,$(REPO):base-ubuntu-22.04) - $(call build-image,./kube-tools/latest,$(REPO):kube-tools,$(REPO):golang-1.20) + $(call build-image,./kube-tools/latest,$(REPO):kube-tools,) $(call build-image,./node-setup,$(REPO):node-setup,$(REPO):base-ubuntu-22.04) .PHONY: build diff --git a/kube-tools/latest/Dockerfile b/kube-tools/latest/Dockerfile index bb9860d..6d9ade7 100644 --- a/kube-tools/latest/Dockerfile +++ b/kube-tools/latest/Dockerfile @@ -1,9 +1,9 @@ -FROM to-be-replaced-by-local-ref/golang:1.20 +FROM quay.io/podman/stable:v4.5 RUN set -euExo pipefail && shopt -s inherit_errexit && \ - apt-get update && \ - apt-get install -y --no-install-recommends rsync && \ - apt-get clean && \ + dnf install -y rsync git make tar gzip golang && \ + dnf clean all && \ + go install github.com/mikefarah/yq/v4@v4.34.1 && \ mkdir -p /go/src/k8s.io/ && \ cd /go/src/k8s.io/ && \ git clone --depth=1 --branch v1.27.3 https://github.com/kubernetes/kubernetes.git && \