From 571dadba63ea49a5630ac09d55be60f0928f3848 Mon Sep 17 00:00:00 2001 From: "Adam D. Cornett" Date: Tue, 2 Sep 2025 11:20:21 -0700 Subject: [PATCH] use go version from builder image, instead of downloading in Dockerfile Signed-off-by: Adam D. Cornett --- images/operator-sdk/Dockerfile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/images/operator-sdk/Dockerfile b/images/operator-sdk/Dockerfile index 87ce50f424a..e5ad4440737 100644 --- a/images/operator-sdk/Dockerfile +++ b/images/operator-sdk/Dockerfile @@ -19,17 +19,12 @@ RUN GOOS=linux GOARCH=$TARGETARCH make build/operator-sdk # Final image. FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6 -# TODO: Figure out how to take the go binary from the builder image so this doesn't have to be maintained. -ENV GO_VERSION=1.23.4 - ARG TARGETARCH RUN microdnf install -y make gcc which tar gzip -RUN curl -sSLo /tmp/go.tar.gz https://golang.org/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz \ - && rm -rf /usr/local/go \ - && tar -C /usr/local -xzf /tmp/go.tar.gz \ - && ln -sf /usr/local/go/bin/* /usr/local/bin/ \ - && rm -f /tmp/go.tar.gz \ - && go version + +# Copy Go runtime from builder image +COPY --from=builder /usr/local/go /usr/local/go +RUN ln -sf /usr/local/go/bin/* /usr/local/bin/ && go version COPY --from=builder /workspace/build/operator-sdk /usr/local/bin/operator-sdk