From ce3a3d0cb6a6f8f804b2855d65aa6f2ea497f5aa Mon Sep 17 00:00:00 2001 From: Abhay Ganvir Date: Tue, 18 Jul 2023 16:40:55 +0530 Subject: [PATCH 1/3] go cve upgrade --- docker/Dockerfile.linux.amd64 | 4 ++-- docker/Dockerfile.linux.arm64 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index 42bec38..b89315b 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -1,7 +1,7 @@ -FROM alpine:3.17 as alpine +FROM alpine:3.18 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.17 +FROM alpine:3.18 ENV GODEBUG netdns=go ENV CI=true COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index 1c37e1f..c3a95c4 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -1,8 +1,8 @@ -FROM arm64v8/alpine:3.12 as alpine +FROM arm64v8/alpine:3.18 as alpine RUN apk add -U --no-cache ca-certificates -FROM arm64v8/alpine:3.12 +FROM arm64v8/alpine:3.16 ENV GODEBUG netdns=go COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ From 02f5428ec86d4d0bd3edfb54d9c47aa75822e303 Mon Sep 17 00:00:00 2001 From: Abhay Ganvir Date: Tue, 18 Jul 2023 19:05:38 +0530 Subject: [PATCH 2/3] go cve upgrade --- docker/Dockerfile.linux.amd64 | 2 +- docker/Dockerfile.linux.arm64 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index b89315b..744c370 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -10,7 +10,7 @@ COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ RUN apk add --update \ curl \ && rm -rf /var/cache/apk/* -RUN curl -fL https://getcli.jfrog.io/v2-jf | sh /dev/stdin 2.37.3 +RUN curl -fL https://getcli.jfrog.io/v2-jf | sh /dev/stdin 2.42.1 RUN mv ./jf /usr/local/bin/jfrog RUN chmod +x /usr/local/bin/jfrog diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index c3a95c4..ecb126e 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -2,7 +2,7 @@ FROM arm64v8/alpine:3.18 as alpine RUN apk add -U --no-cache ca-certificates -FROM arm64v8/alpine:3.16 +FROM arm64v8/alpine:3.12 ENV GODEBUG netdns=go COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ @@ -11,7 +11,7 @@ COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ RUN apk add --update \ curl \ && rm -rf /var/cache/apk/* -RUN curl -fL https://getcli.jfrog.io/v2-jf | sh /dev/stdin 2.37.3 +RUN curl -fL https://getcli.jfrog.io/v2-jf | sh /dev/stdin 2.42.1 RUN mv ./jf /usr/local/bin/jfrog RUN chmod +x /usr/local/bin/jfrog From 5c62fb3231eb3c6f1eb6322fa71e58b7b35bd359 Mon Sep 17 00:00:00 2001 From: Abhay Ganvir Date: Tue, 18 Jul 2023 19:34:17 +0530 Subject: [PATCH 3/3] go cve upgrade --- docker/Dockerfile.linux.amd64 | 4 ++-- docker/Dockerfile.linux.arm64 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index 744c370..ff590ba 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -1,7 +1,7 @@ -FROM alpine:3.18 as alpine +FROM alpine:3.17 as alpine RUN apk add -U --no-cache ca-certificates -FROM alpine:3.18 +FROM alpine:3.17 ENV GODEBUG netdns=go ENV CI=true COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index ecb126e..3d91ab5 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.18 as alpine +FROM arm64v8/alpine:3.12 as alpine RUN apk add -U --no-cache ca-certificates