public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #467 from helmfile/qtran/docker-build-wget 

use curl instead of wget & update helm to 3.10.1
This commit is contained in:
yxxhero 2022-10-25 16:17:57 +08:00 committed by GitHub
parent d4b1b078cf 7d05ffd098
commit 4a5928e269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -17,13 +17,13 @@ LABEL org.opencontainers.image.source https://github.com/helmfile/helmfile
RUN apk add --no-cache ca-certificates git bash curl jq openssh-client RUN apk add --no-cache ca-certificates git bash curl jq openssh-client
ARG HELM_VERSION="v3.10.0" ARG HELM_VERSION="v3.10.1"
ARG HELM_SHA256="bf56beb418bb529b5e0d6d43d56654c5a03f89c98400b409d1013a33d9586474" ARG HELM_SHA256="c12d2cd638f2d066fec123d0bd7f010f32c643afdf288d39a4610b1f9cb32af3"
ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_LOCATION="https://get.helm.sh"
ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
RUN set -x && \ RUN set -x && \
wget ${HELM_LOCATION}/${HELM_FILENAME} && \ curl --retry 5 --retry-connrefused -LO ${HELM_LOCATION}/${HELM_FILENAME} && \
echo Verifying ${HELM_FILENAME}... && \ echo Verifying ${HELM_FILENAME}... && \
sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \ sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \
echo Extracting ${HELM_FILENAME}... && \ echo Extracting ${HELM_FILENAME}... && \

8
Dockerfile.debian-stable-slim
View File

@ -21,13 +21,13 @@ RUN apt update -qq && \
git bash curl jq wget openssh-client && \ git bash curl jq wget openssh-client && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG HELM_VERSION="v3.10.0" ARG HELM_VERSION="v3.10.1"
ARG HELM_SHA256="bf56beb418bb529b5e0d6d43d56654c5a03f89c98400b409d1013a33d9586474" ARG HELM_SHA256="c12d2cd638f2d066fec123d0bd7f010f32c643afdf288d39a4610b1f9cb32af3"
ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_LOCATION="https://get.helm.sh"
ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
RUN set -x && \ RUN set -x && \
wget "${HELM_LOCATION}/${HELM_FILENAME}" && \ curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \
echo "Verifying ${HELM_FILENAME}..." && \ echo "Verifying ${HELM_FILENAME}..." && \
sha256sum "${HELM_FILENAME}" | grep -q "${HELM_SHA256}" && \ sha256sum "${HELM_FILENAME}" | grep -q "${HELM_SHA256}" && \
echo "Extracting ${HELM_FILENAME}..." && \ echo "Extracting ${HELM_FILENAME}..." && \
@ -42,7 +42,7 @@ RUN set -x && \
ENV KUBECTL_VERSION="v1.25.2" ENV KUBECTL_VERSION="v1.25.2"
ENV KUBECTL_SHA256="8639f2b9c33d38910d706171ce3d25be9b19fc139d0e3d4627f38ce84f9040eb" ENV KUBECTL_SHA256="8639f2b9c33d38910d706171ce3d25be9b19fc139d0e3d4627f38ce84f9040eb"
RUN set -x && \ RUN set -x && \
wget "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \ curl --retry 5 --retry-connrefused -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \
sha256sum kubectl | grep ${KUBECTL_SHA256} && \ sha256sum kubectl | grep ${KUBECTL_SHA256} && \
chmod +x kubectl && \ chmod +x kubectl && \
mv kubectl /usr/local/bin/kubectl mv kubectl /usr/local/bin/kubectl

6
Dockerfile.ubuntu
View File

@ -21,13 +21,13 @@ RUN apt-get update && \
git bash curl jq wget openssh-client && \ git bash curl jq wget openssh-client && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG HELM_VERSION="v3.10.0" ARG HELM_VERSION="v3.10.1"
ARG HELM_SHA256="bf56beb418bb529b5e0d6d43d56654c5a03f89c98400b409d1013a33d9586474" ARG HELM_SHA256="c12d2cd638f2d066fec123d0bd7f010f32c643afdf288d39a4610b1f9cb32af3"
ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_LOCATION="https://get.helm.sh"
ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
RUN set -x && \ RUN set -x && \
wget ${HELM_LOCATION}/${HELM_FILENAME} && \ curl --retry 5 --retry-connrefused -LO ${HELM_LOCATION}/${HELM_FILENAME} && \
echo Verifying ${HELM_FILENAME}... && \ echo Verifying ${HELM_FILENAME}... && \
sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \ sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \
echo Extracting ${HELM_FILENAME}... && \ echo Extracting ${HELM_FILENAME}... && \