From 99fc8238adb74c4251253dd67f067d0bf0f60731 Mon Sep 17 00:00:00 2001 From: Pradipta Banerjee Date: Mon, 9 Sep 2024 00:05:45 -0400 Subject: [PATCH] golang-image: Update to 1.22.7 Fixes Vulnerability #1: GO-2024-3106 Signed-off-by: Pradipta Banerjee --- hack/Dockerfile.golang | 10 +++++----- src/cloud-api-adaptor/Dockerfile | 2 +- src/peerpod-ctrl/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hack/Dockerfile.golang b/hack/Dockerfile.golang index 18aea15699..2b1acdff31 100644 --- a/hack/Dockerfile.golang +++ b/hack/Dockerfile.golang @@ -5,11 +5,11 @@ FROM --platform=$TARGETPLATFORM ${BASE_IMAGE} AS base # DO NOT UPDATE THIS BY HAND !! # Use hack/update-go-container.sh to update the version and hashes. -ARG GO_VERSION=1.21.12 -ARG GO_LINUX_ARM64_SHA256=94cb3ec4a1e08a00da55c33e63f725be91f10ba743907b5615ef34e54675ba2e -ARG GO_LINUX_AMD64_SHA256=121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5 -ARG GO_LINUX_PPC64LE_SHA256=46b2dae42132fd697c6c34a6bee3df8e3288b9f01143eafbcc452b0d2a35b205 -ARG GO_LINUX_S390X_SHA256=3746ddaafedb9f1744a647c51b9c4454b82a699de0f6dffbb2f3cb698a846482 +ARG GO_VERSION=1.22.7 +ARG GO_LINUX_ARM64_SHA256=ed695684438facbd7e0f286c30b7bc2411cfc605516d8127dc25c62fe5b03885 +ARG GO_LINUX_AMD64_SHA256=fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb +ARG GO_LINUX_PPC64LE_SHA256=a6441d5da40a961039ec22b0aadbc8b513f52b31bb8919c359a7e2c3c5bcf26a +ARG GO_LINUX_S390X_SHA256=08dc28de0dafb175501b9d1623c9b11a9b734eb4b3a35c9c658cc91d4dfce3f3 FROM base AS base-amd64 ADD --checksum=sha256:${GO_LINUX_AMD64_SHA256} https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz . diff --git a/src/cloud-api-adaptor/Dockerfile b/src/cloud-api-adaptor/Dockerfile index 16719c4189..ad6e95fe31 100644 --- a/src/cloud-api-adaptor/Dockerfile +++ b/src/cloud-api-adaptor/Dockerfile @@ -1,5 +1,5 @@ ARG BUILD_TYPE=dev -ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.21.12-39 +ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.22.7-39 ARG BASE=registry.fedoraproject.org/fedora:39 # This dockerfile uses Go cross-compilation to build the binary, diff --git a/src/peerpod-ctrl/Dockerfile b/src/peerpod-ctrl/Dockerfile index d5f8dc9ae2..b0974bbecb 100644 --- a/src/peerpod-ctrl/Dockerfile +++ b/src/peerpod-ctrl/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$TARGETPLATFORM quay.io/confidential-containers/golang-fedora:1.21.12-39 AS builder +FROM --platform=$TARGETPLATFORM quay.io/confidential-containers/golang-fedora:1.22.7-39 AS builder ARG TARGETOS ARG TARGETARCH ARG CGO_ENABLED=1