From 8ad77ea17d950af6e054bef99b55ecc8e328264a Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Fri, 27 Oct 2023 19:56:35 -0400 Subject: [PATCH] some updates (#716) Signed-off-by: Dave Henderson --- .trivyignore | 5 +++++ ci-builder/Dockerfile | 2 +- gomplate-ci-build/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.trivyignore b/.trivyignore index af911b65..9d92e09e 100644 --- a/.trivyignore +++ b/.trivyignore @@ -32,3 +32,8 @@ CVE-2023-34231 # bashbrew & gomplate - google.golang.org/grpc vuln - not relevant CVE-2023-32731 +GHSA-m425-mq94-257g +CVE-2022-48174 + +# docker-buildx - otel vuln - not relevant +CVE-2023-45142 diff --git a/ci-builder/Dockerfile b/ci-builder/Dockerfile index 60ed42a0..8916fd87 100644 --- a/ci-builder/Dockerfile +++ b/ci-builder/Dockerfile @@ -3,7 +3,7 @@ FROM consul:1.15.4 AS consul FROM docker:24.0 AS docker FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew FROM docker/buildx-bin:0.11.2 AS buildx-plugin -FROM golangci/golangci-lint:v1.54.2-alpine AS golangci-lint +FROM golangci/golangci-lint:v1.55.1-alpine AS golangci-lint FROM alpine:3.18 AS cc-test-reporter diff --git a/gomplate-ci-build/Dockerfile b/gomplate-ci-build/Dockerfile index 20a4c9b7..bb7be0ae 100644 --- a/gomplate-ci-build/Dockerfile +++ b/gomplate-ci-build/Dockerfile @@ -3,7 +3,7 @@ FROM consul:1.15.4 AS consul FROM docker:24.0 AS docker FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew FROM docker/buildx-bin:0.11.2 AS buildx-plugin -FROM golangci/golangci-lint:v1.54.2-alpine AS golangci-lint +FROM golangci/golangci-lint:v1.55.1-alpine AS golangci-lint FROM alpine:3.18 AS cc-test-reporter