From 109cf6820d2fec044504c6d26ae8661d6098ef2d Mon Sep 17 00:00:00 2001 From: Rayan Das Date: Wed, 26 Jul 2023 18:46:01 +0530 Subject: [PATCH] Update base image and add utilities to kubectl image Signed-off-by: Rayan Das --- build/dependencies.yaml | 2 ++ build/server-image/kubectl/Dockerfile | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 9e8b6a6f1f9..7c4d811886d 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -144,6 +144,8 @@ dependencies: - name: "registry.k8s.io/debian-base: dependents" version: bookworm-v1.0.0 refPaths: + - path: build/server-image/kubectl/Dockerfile + match: FROM\s+registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - path: cluster/images/etcd/Makefile match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - path: cluster/images/etcd/Makefile diff --git a/build/server-image/kubectl/Dockerfile b/build/server-image/kubectl/Dockerfile index 0c93ca6a4e1..7cbc9e9136a 100644 --- a/build/server-image/kubectl/Dockerfile +++ b/build/server-image/kubectl/Dockerfile @@ -14,10 +14,21 @@ # Dockerfile used for the kubectl image. -ARG BASEIMAGE ARG BINARY -FROM "${BASEIMAGE}" +FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.0 COPY ${BINARY} /bin/ + +# Install additional utilities +RUN apt update \ + && apt install -y bash \ + grep \ + sed \ + gawk \ + coreutils \ + jq \ + diffutils \ + && rm -rf /var/lib/apt/lists/* + ENTRYPOINT ["/bin/kubectl"]