From 2230022ad006b9487e85c135bacc827819c6251b Mon Sep 17 00:00:00 2001 From: Jasstkn Date: Wed, 15 Jun 2022 15:03:23 +0200 Subject: [PATCH 1/3] feat(dockerfile): update helm to 3.9.0 Signed-off-by: Jasstkn --- Dockerfile | 4 ++-- Dockerfile.debian | 4 ++-- Dockerfile.ubuntu | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index eee9e6ba..e10dd50d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,8 @@ LABEL org.opencontainers.image.source https://github.com/helmfile/helmfile RUN apk add --no-cache ca-certificates git bash curl jq openssh-client -ARG HELM_VERSION="v3.8.2" -ARG HELM_SHA256="6cb9a48f72ab9ddfecab88d264c2f6508ab3cd42d9c09666be16a7bf006bed7b" +ARG HELM_VERSION="v3.9.0" +ARG HELM_SHA256="1484ffb0c7a608d8069470f48b88d729e88c41a1b6602f145231e8ea7b43b50a" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" diff --git a/Dockerfile.debian b/Dockerfile.debian index 0056659e..84fddb86 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -21,8 +21,8 @@ RUN apt update -qq && \ git bash curl jq wget openssh-client && \ rm -rf /var/lib/apt/lists/* -ARG HELM_VERSION="v3.8.2" -ARG HELM_SHA256="6cb9a48f72ab9ddfecab88d264c2f6508ab3cd42d9c09666be16a7bf006bed7b" +ARG HELM_VERSION="v3.9.0" +ARG HELM_SHA256="1484ffb0c7a608d8069470f48b88d729e88c41a1b6602f145231e8ea7b43b50a" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index b97b5e6d..375baf56 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -22,7 +22,7 @@ RUN apt update -qq && \ rm -rf /var/lib/apt/lists/* ARG HELM_VERSION="v3.8.2" -ARG HELM_SHA256="6cb9a48f72ab9ddfecab88d264c2f6508ab3cd42d9c09666be16a7bf006bed7b" +ARG HELM_SHA256="1484ffb0c7a608d8069470f48b88d729e88c41a1b6602f145231e8ea7b43b50a" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" From 724c8eea095d2aab6fdace4ac0775adbf2a5f4dc Mon Sep 17 00:00:00 2001 From: Jasstkn Date: Wed, 15 Jun 2022 15:44:49 +0200 Subject: [PATCH 2/3] fix: arg helm_version in Dockerfile.ubuntu Signed-off-by: Jasstkn --- Dockerfile.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 375baf56..21ff7cd9 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -21,7 +21,7 @@ RUN apt update -qq && \ git bash curl jq wget openssh-client && \ rm -rf /var/lib/apt/lists/* -ARG HELM_VERSION="v3.8.2" +ARG HELM_VERSION="v3.9.0" ARG HELM_SHA256="1484ffb0c7a608d8069470f48b88d729e88c41a1b6602f145231e8ea7b43b50a" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" From 4fa305c38a8504ab667e698349a20093ef329046 Mon Sep 17 00:00:00 2001 From: Jasstkn Date: Thu, 16 Jun 2022 09:48:56 +0200 Subject: [PATCH 3/3] fix: build of Dockerfile.ubuntu Signed-off-by: Jasstkn --- Dockerfile.ubuntu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 21ff7cd9..fae93148 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -11,12 +11,12 @@ RUN make static-linux # ----------------------------------------------------------------------------- -FROM ubuntu:20.10 +FROM ubuntu:20.04 LABEL org.opencontainers.image.source https://github.com/helmfile/helmfile -RUN apt update -qq && \ - apt install --no-install-recommends -y \ +RUN apt-get update && \ + apt-get install --no-install-recommends -y \ ca-certificates \ git bash curl jq wget openssh-client && \ rm -rf /var/lib/apt/lists/* @@ -60,7 +60,7 @@ ENV SOPS_VERSION="v3.7.3" RUN set -x && \ curl --retry 5 --retry-connrefused -LO https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux.amd64 && \ chmod +x sops-${SOPS_VERSION}.linux.amd64 && \ - mv sops-${SOPS_VERSION}.linux.amd64 /usr/local/bin/sops \ + mv sops-${SOPS_VERSION}.linux.amd64 /usr/local/bin/sops ENV AGE_VERSION="v1.0.0" RUN set -x && \