From 47653e71eaca8749a8e9a9b3d95d0642e9106cbb Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Mon, 20 Jan 2025 12:02:22 +0100 Subject: [PATCH] bump alpine and tools (#704) * bump alpine and tools Signed-off-by: cpanato * drop pinned yamllint version Signed-off-by: cpanato --------- Signed-off-by: cpanato --- Dockerfile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index e8ec3ba..679ff63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,31 +1,37 @@ -FROM alpine:3.19 +FROM alpine:3.21 RUN apk --no-cache add \ bash \ - curl>7.77.0-r0 \ + curl \ git \ libc6-compat \ openssh-client \ py3-pip \ py3-wheel \ python3 \ - yamllint=1.33.0-r0 + yamllint # Install Yamale YAML schema validator -ARG yamale_version=4.0.4 +ARG yamale_version=6.0.0 LABEL yamale-version=$yamale_version RUN pip install --break-system-packages "yamale==$yamale_version" ARG TARGETPLATFORM # Install kubectl -ARG kubectl_version=v1.30.0 +ARG kubectl_version=v1.32.0 LABEL kubectl-version=$kubectl_version -RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/$kubectl_version/bin/$TARGETPLATFORM/kubectl" && \ - chmod +x kubectl && \ - mv kubectl /usr/local/bin/ +RUN targetArch=$(echo $TARGETPLATFORM | cut -f2 -d '/') \ + && if [ ${targetArch} = "amd64" ]; then \ + HELM_ARCH="linux/amd64"; \ +elif [ ${targetArch} = "arm64" ]; then \ + HELM_ARCH="linux/arm64"; \ +fi \ + && curl -LO "dl.k8s.io/$kubectl_version/bin/$HELM_ARCH/kubectl" \ + && chmod +x kubectl \ + && mv kubectl /usr/local/bin/ # Install Helm -ARG helm_version=v3.14.4 +ARG helm_version=v3.16.4 LABEL helm-version=$helm_version RUN targetArch=$(echo $TARGETPLATFORM | cut -f2 -d '/') \ && if [ ${targetArch} = "amd64" ]; then \