From 7dffd3bf5daa471b1e5a5acc613bed598e628ba7 Mon Sep 17 00:00:00 2001 From: cx-ruiaraujo Date: Thu, 4 Jul 2024 16:11:15 +0100 Subject: [PATCH 1/2] update go version and golden images --- Dockerfile | 4 ++-- go.mod | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2740c7a8dff..c8dddc0bbcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM cgr.dev/chainguard/go@sha256:33158972c85a407c195aa3afb8b9c0b3e29d3c84d807bd1575271b8bd02e1d2d as build_env +FROM cgr.dev/chainguard/go@sha256:54b74a40acfc93d62bd32c72e3afe19bc55e4b2db7baa09d5950f3e5878baf28 as build_env # Copy the source from the current directory to the Working Directory inside the container WORKDIR /app @@ -31,7 +31,7 @@ USER nonroot # Runtime image # Ignore no User Cmd since KICS container is stopped afer scan # kics-scan ignore-line -FROM cgr.dev/chainguard/git@sha256:86896961b6049d834913780b8c8fef780f0db67b60010ad06bf06f90207d58b7 +FROM cgr.dev/chainguard/git@sha256:f3ed07723172f93a50715cf6189be7c7526232ff88035e3eb24046bfffeb8f5c ENV TERM xterm-256color diff --git a/go.mod b/go.mod index 7b90aec0923..d796704ced1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Checkmarx/kics/v2 -go 1.22.4 +go 1.22.5 replace ( github.com/containerd/containerd => github.com/containerd/containerd v1.6.26 From 10f2905c6d37082335abf06b734750a85ab65184 Mon Sep 17 00:00:00 2001 From: cx-ruiaraujo Date: Thu, 4 Jul 2024 16:19:50 +0100 Subject: [PATCH 2/2] update go image --- docker/Dockerfile.debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 02347c9c795..a738737d769 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -3,7 +3,7 @@ # it does not define an ENTRYPOINT as this is a requirement described here: # https://docs.microsoft.com/en-us/azure/devops/pipelines/process/container-phases?view=azure-devops#linux-based-containers # -FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22.4-bookworm as build_env +FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22.5-bookworm as build_env # Create a group and user RUN groupadd checkmarx && useradd -g checkmarx -M -s /bin/bash checkmarx USER checkmarx