From 737ce00acb063bc7e0724fbaaca611996feae03b Mon Sep 17 00:00:00 2001 From: Dylan Page Date: Tue, 4 Apr 2023 17:13:55 -0500 Subject: [PATCH 1/2] ci: fix pipefail in golang builder image --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 938b4ed07d..a1ab061a32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,8 @@ WORKDIR /app # This is needed to download transitive dependencies instead of compiling them # https://github.com/montanaflynn/golang-docker-cache # https://github.com/golang/go/issues/27719 +RUN apk add --no-cache \ + bash~=5.2 COPY go.mod go.sum ./ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get From 5c6b8470a98a8b9a8922943a52e4407bdcee0bd7 Mon Sep 17 00:00:00 2001 From: Dylan Page Date: Tue, 4 Apr 2023 17:31:30 -0500 Subject: [PATCH 2/2] fix: curl version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a1ab061a32..528b8ef1bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -166,7 +166,7 @@ RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/ma git~=2.40 && \ apk add --no-cache \ ca-certificates~=20220614 \ - curl~=7.87 \ + curl~=7.88 \ unzip~=6.0 \ bash~=5.2 \ openssh~=9.1_p1 \