From bdf78c1457866be1ec44111a255366eec7b67c4f Mon Sep 17 00:00:00 2001 From: Alexander Didenko Date: Thu, 7 Nov 2024 12:53:31 +0100 Subject: [PATCH 1/2] Bump go version to 1.22.9 This should fix some stdlib CVEs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d69ac75..32cf81d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # @authors Minigun Maintainers # @copyright 2020 Wayfair, LLC -- All rights reserved. -FROM golang:1.22 as test +FROM golang:1.22.9 as test ENV GOPATH=/go ENV PATH="$PATH:$GOPATH/bin" WORKDIR /go/src/github.com/wayfair-incubator/minigun From 0cb73b32793f90ebd03539fe90b515201d199ad0 Mon Sep 17 00:00:00 2001 From: Alexander Didenko Date: Thu, 7 Nov 2024 14:13:37 +0100 Subject: [PATCH 2/2] Fix format warnings --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32cf81d..da1a3b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,14 +6,14 @@ # @authors Minigun Maintainers # @copyright 2020 Wayfair, LLC -- All rights reserved. -FROM golang:1.22.9 as test +FROM golang:1.22.9 AS test ENV GOPATH=/go ENV PATH="$PATH:$GOPATH/bin" WORKDIR /go/src/github.com/wayfair-incubator/minigun COPY . ./ RUN make test -FROM test as build +FROM test AS build ENV GOPATH=/go ENV PATH="$PATH:$GOPATH/bin" WORKDIR /go/src/github.com/wayfair-incubator/minigun