From 170e29a5587ad930a87389b6fdb773613c07b99d Mon Sep 17 00:00:00 2001 From: Quan TRAN Date: Fri, 7 Jan 2022 00:58:54 +0100 Subject: [PATCH] bump to go 1.17.3 with alpine 3.13 (#2024) * bump to go 1.17.5 * bump to go 1.17.3 for circleci * use alping 3.15 & helm 3.7.2 * use golang 1.17.3 and alpine 3.13 instead because of this issue: https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2 --- .circleci/Makefile | 2 +- .circleci/config.yml | 12 ++++++------ Dockerfile | 8 ++++---- Dockerfile.debian | 6 +++--- Dockerfile.helm3 | 8 ++++---- Dockerfile.helm3.ubuntu | 6 +++--- Dockerfile.ubuntu | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/Makefile b/.circleci/Makefile index 7a16586d..4ad5bc23 100644 --- a/.circleci/Makefile +++ b/.circleci/Makefile @@ -1,4 +1,4 @@ -HELM_VERSION ?= v3.7.0 +HELM_VERSION ?= v3.7.2 KUSTOMIZE_VERSION ?= v3.8.8 K8S_VERSION ?= v1.13.12 MINIKUBE_VERSION ?= v0.30.0 diff --git a/.circleci/config.yml b/.circleci/config.yml index 2607a237..5ced1851 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: build: docker: - - image: circleci/golang:1.16.3 + - image: circleci/golang:1.17.3 environment: GOPATH: /go working_directory: /home/circleci/workspace/helmfile @@ -27,7 +27,7 @@ jobs: - . image: docker: - - image: circleci/golang:1.16.3 + - image: circleci/golang:1.17.3 working_directory: /home/circleci/workspace/helmfile steps: - checkout @@ -44,7 +44,7 @@ jobs: image_debian: docker: - - image: circleci/golang:1.16.3 + - image: circleci/golang:1.17.3 working_directory: /home/circleci/workspace/helmfile steps: - checkout @@ -63,7 +63,7 @@ jobs: environment: GOPATH: /go docker: - - image: circleci/golang:1.16.3 + - image: circleci/golang:1.17.3 working_directory: /home/circleci/workspace/helmfile steps: - checkout @@ -115,7 +115,7 @@ jobs: release: docker: - - image: circleci/golang:1.16.3 + - image: circleci/golang:1.17.3 working_directory: /home/circleci/workspace/helmfile steps: - checkout @@ -145,7 +145,7 @@ workflows: - build matrix: parameters: - helm-version: ["v3.4.2", "v3.5.4", "v3.6.3", "v3.7.0"] + helm-version: ["v3.4.2", "v3.5.4", "v3.6.3", "v3.7.2"] - release: filters: branches: diff --git a/Dockerfile b/Dockerfile index 6103fdb0..3a3e9ee7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.3-alpine3.13 as builder +FROM golang:1.17.3-alpine3.13 as builder RUN apk add --no-cache make git WORKDIR /workspace/helmfile @@ -7,12 +7,12 @@ RUN make static-linux # ----------------------------------------------------------------------------- -FROM alpine:3.11 +FROM alpine:3.13 RUN apk add --no-cache ca-certificates git bash curl jq -ARG HELM_VERSION="v3.7.0" -ARG HELM_SHA256="096e30f54c3ccdabe30a8093f8e128dba76bb67af697b85db6ed0453a2701bf9" +ARG HELM_VERSION="v3.7.2" +ARG HELM_SHA256="4ae30e48966aba5f807a4e140dad6736ee1a392940101e4d79ffb4ee86200a9e" 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 1c58cdf6..90e1e03b 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -1,4 +1,4 @@ -FROM golang:1.16.7 as builder +FROM golang:1.17.3 as builder RUN apt-get update \ && apt-get install --no-install-recommends -y \ @@ -25,8 +25,8 @@ RUN apt-get update \ wget \ && rm -rf /var/lib/apt/lists/* -ARG HELM_VERSION="v3.7.0" -ARG HELM_SHA256="096e30f54c3ccdabe30a8093f8e128dba76bb67af697b85db6ed0453a2701bf9" +ARG HELM_VERSION="v3.7.2" +ARG HELM_SHA256="4ae30e48966aba5f807a4e140dad6736ee1a392940101e4d79ffb4ee86200a9e" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" diff --git a/Dockerfile.helm3 b/Dockerfile.helm3 index 07448bd6..1ae12f4c 100644 --- a/Dockerfile.helm3 +++ b/Dockerfile.helm3 @@ -1,4 +1,4 @@ -FROM golang:1.16.3-alpine3.13 as builder +FROM golang:1.17.3-alpine3.13 as builder RUN apk add --no-cache make git WORKDIR /workspace/helmfile @@ -7,14 +7,14 @@ RUN make static-linux # ----------------------------------------------------------------------------- -FROM alpine:3.11 +FROM alpine:3.13 RUN apk add --no-cache ca-certificates git bash curl jq -ARG HELM_VERSION="v3.7.0" +ARG HELM_VERSION="v3.7.2" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" -ARG HELM_SHA256="096e30f54c3ccdabe30a8093f8e128dba76bb67af697b85db6ed0453a2701bf9" +ARG HELM_SHA256="4ae30e48966aba5f807a4e140dad6736ee1a392940101e4d79ffb4ee86200a9e" RUN set -x && \ wget ${HELM_LOCATION}/${HELM_FILENAME} && \ echo Verifying ${HELM_FILENAME}... && \ diff --git a/Dockerfile.helm3.ubuntu b/Dockerfile.helm3.ubuntu index 30491588..ae46fd4f 100644 --- a/Dockerfile.helm3.ubuntu +++ b/Dockerfile.helm3.ubuntu @@ -1,4 +1,4 @@ -FROM golang:1.16.3-buster as builder +FROM golang:1.17.3-buster as builder RUN apt update -qq && \ apt install --no-install-recommends -y make git && \ @@ -17,10 +17,10 @@ RUN apt update -qq && \ git bash curl jq pip wget && \ rm -rf /var/lib/apt/lists/* -ARG HELM_VERSION="v3.7.0" +ARG HELM_VERSION="v3.7.2" ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" -ARG HELM_SHA256="096e30f54c3ccdabe30a8093f8e128dba76bb67af697b85db6ed0453a2701bf9" +ARG HELM_SHA256="4ae30e48966aba5f807a4e140dad6736ee1a392940101e4d79ffb4ee86200a9e" RUN set -x && \ wget ${HELM_LOCATION}/${HELM_FILENAME} && \ echo Verifying ${HELM_FILENAME}... && \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index fbf044da..4bfc5942 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM golang:1.16.3-buster as builder +FROM golang:1.17.3-buster as builder RUN apt update -qq && \ apt install --no-install-recommends -y make git && \