From e7ea0543b75e1cfad1d976799755e53f59311af9 Mon Sep 17 00:00:00 2001 From: nginx-bot <68849795+nginx-bot@users.noreply.github.com> Date: Wed, 29 May 2024 03:04:23 -0700 Subject: [PATCH] Docker image update d41d8cd9 (#5637) * Update docker images d41d8cd9 * remove duplicate references --------- Co-authored-by: Eoin O'Shaughnessy --- build/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 182b35a89e..4d9d59fc3b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -13,6 +13,7 @@ FROM opentracing/nginx-opentracing:nginx-1.26.0@sha256:d4cf6abce9be18707c2c47a85 FROM opentracing/nginx-opentracing:nginx-1.26.0-alpine@sha256:00a2a88cf8d433a10e22158f5ba7acffa4989242c677f7e9e2a4d7fcce6b3888 as alpine-opentracing-lib FROM ghcr.io/nginxinc/alpine-fips:0.1.0-alpine3.17@sha256:f00b3f266422feaaac7b733b46903bd19eb1cd1caa6991131576f5f767db76f8 as alpine-fips-3.17 FROM ghcr.io/nginxinc/alpine-fips:0.2.0-alpine3.19@sha256:1744ae3a8e795daf771f3f7df33b83160981545abb1f1597338e2769d06aa1cc as alpine-fips-3.19 +FROM golang:1.22-alpine@sha256:421bc7f4b90d042c56282bb894451108f8ab886687e1b73abaefad31ab10a14d as golang-builder ############################################# Base image for Alpine ############################################# @@ -408,7 +409,7 @@ LABEL org.opencontainers.image.version="${IC_VERSION}" \ ############################################# Build nginx-ingress in golang container ############################################# -FROM golang:1.22-alpine@sha256:b8ded51bad03238f67994d0a6b88680609b392db04312f60c23358cc878d4902 AS builder +FROM golang-builder AS builder ARG IC_VERSION ARG TARGETARCH @@ -421,7 +422,7 @@ RUN --mount=type=bind,target=/go/src/github.com/nginxinc/kubernetes-ingress/ --m ############################################# Download delve ############################################# -FROM golang:1.22-alpine@sha256:b8ded51bad03238f67994d0a6b88680609b392db04312f60c23358cc878d4902 AS debug-builder +FROM golang-builder AS debug-builder ARG TARGETARCH WORKDIR /go/src/github.com/nginxinc/kubernetes-ingress/