From 92a1e66b259a43a0606d8d554a77832fc887c18e Mon Sep 17 00:00:00 2001 From: Joshua Casey Date: Wed, 15 Oct 2025 14:08:17 -0500 Subject: [PATCH] Bump test-binaries-image dockerfiles to golang:1.25.3-bookworm --- pipelines/shared-helpers/test-binaries-image/Dockerfile | 7 +------ .../shared-helpers/test-binaries-image/Dockerfile_fips | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pipelines/shared-helpers/test-binaries-image/Dockerfile b/pipelines/shared-helpers/test-binaries-image/Dockerfile index 848ebf8ec..799a807b0 100644 --- a/pipelines/shared-helpers/test-binaries-image/Dockerfile +++ b/pipelines/shared-helpers/test-binaries-image/Dockerfile @@ -3,12 +3,7 @@ # Copyright 2020-2025 the Pinniped contributors. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 - -# Using bullseye (debian 11) until google/cloud-sdk starts using bookworm (debian 12) because the -# test binaries built by this dockerfile are run in a container built by dockerfiles/integration-test-runner/Dockerfile -# which uses google/cloud-sdk as the base image. Mismatching debian versions causes the pinniped-integration-test -# built below to error upon execution complaining that the expected version of GLIBC is not found. -FROM golang:1.25rc3-bullseye as build-env +FROM golang:1.25.3-bookworm as build-env WORKDIR /work COPY . . ARG GOPROXY diff --git a/pipelines/shared-helpers/test-binaries-image/Dockerfile_fips b/pipelines/shared-helpers/test-binaries-image/Dockerfile_fips index 550f94509..4c04abee5 100644 --- a/pipelines/shared-helpers/test-binaries-image/Dockerfile_fips +++ b/pipelines/shared-helpers/test-binaries-image/Dockerfile_fips @@ -6,11 +6,7 @@ # we need a separate dockerfile for the fips test image so that the integration tests # use the right ciphers etc. -# Using bullseye (debian 11) until google/cloud-sdk starts using bookworm (debian 12) because the -# test binaries built by this dockerfile are run in a container built by dockerfiles/integration-test-runner/Dockerfile -# which uses google/cloud-sdk as the base image. Mismatching debian versions causes the pinniped-integration-test -# built below to error upon execution complaining that the expected version of GLIBC is not found. -FROM golang:1.25rc3-bullseye as build-env +FROM golang:1.25.3-bookworm as build-env WORKDIR /work COPY . . ARG GOPROXY