Revert Dockerfiles to match synced fork

Author: menahyouyeah

deploy/skaffold/Dockerfile.deps

@@ -1,3 +1,4 @@
+ARG BASE_PREFIX=mirror.gcr.io/library/
 # Copyright 2019 The Skaffold Authors All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +15,12 @@
 
 ARG ARCH=amd64
 
+FROM ${BASE_PREFIX}docker:28.1.1 as docker-source
+FROM docker/buildx-bin:0.23.0 as buildx-source
+FROM ${BASE_PREFIX}golang:1.25.5 as golang-source
+
 # Download kubectl
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-kubectl
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-kubectl
 ARG ARCH
 # https://dl.k8s.io/release/stable.txt
 ENV KUBECTL_VERSION v1.33.0
@@ -25,7 +30,7 @@ RUN wget -O kubectl "${KUBECTL_URL}" && sha256sum -c kubectl.${ARCH}.sha256
 RUN chmod +x kubectl
 
 # Download helm (see https://github.com/helm/helm/releases/latest)
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-helm
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-helm
 ARG ARCH
 RUN echo arch=$ARCH
 ENV HELM_VERSION v3.17.3
@@ -35,7 +40,7 @@ RUN wget -O helm.tar.gz "${HELM_URL}" && sha256sum -c helm.${ARCH}.sha256
 RUN tar -xvf helm.tar.gz --strip-components 1
 
 # Download kustomize (see https://github.com/kubernetes-sigs/kustomize/releases/latest)
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-kustomize
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-kustomize
 ARG ARCH
 ENV KUSTOMIZE_VERSION 5.6.0
 ENV KUSTOMIZE_URL https://storage.googleapis.com/skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
@@ -44,7 +49,7 @@ RUN wget -O kustomize.tar.gz "${KUSTOMIZE_URL}" && sha256sum -c kustomize.${ARCH
 RUN tar -xvf kustomize.tar.gz
 
 # Download kpt (see https://github.com/kptdev/kpt/releases/latest)
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-kpt
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-kpt
 ARG ARCH
 ENV KPT_VERSION 1.0.0-beta.57
 ENV KPT_URL https://storage.googleapis.com/skaffold/deps/kpt/v${KPT_VERSION}/kpt_linux_amd64
@@ -53,7 +58,7 @@ RUN wget -O kpt "${KPT_URL}" && sha256sum -c kpt.${ARCH}.sha256
 RUN chmod +x kpt
 
 # Download kompose (see https://github.com/kubernetes/kompose/releases/latest)
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-kompose
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-kompose
 ARG ARCH
 ENV KOMPOSE_VERSION v1.35.0
 ENV KOMPOSE_URL https://storage.googleapis.com/skaffold/deps/kompose/${KOMPOSE_VERSION}/kompose-linux-amd64
@@ -62,7 +67,7 @@ RUN wget -O kompose "${KOMPOSE_URL}" && sha256sum -c kompose.${ARCH}.sha256
 RUN chmod +x kompose
 
 # Download container-structure-test (https://github.com/GoogleContainerTools/container-structure-test/releases/latest)
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-container-structure-test
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-container-structure-test
 ARG ARCH
 ENV CONTAINER_STRUCTURE_TEST_VERSION v1.19.3
 ENV CONTAINER_STRUCTURE_TEST_URL https://storage.googleapis.com/skaffold/deps/container-structure-test/${CONTAINER_STRUCTURE_TEST_VERSION}/container-structure-test-linux-${ARCH}
@@ -71,7 +76,7 @@ RUN wget -O container-structure-test "${CONTAINER_STRUCTURE_TEST_URL}" && sha512
 RUN chmod +x container-structure-test
 
 # Download kind (see https://github.com/kubernetes-sigs/kind/releases/latest)
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-kind
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-kind
 ARG ARCH
 ENV KIND_VERSION v0.27.0
 ENV KIND_URL https://storage.googleapis.com/skaffold/deps/kind/${KIND_VERSION}/kind-linux-${ARCH}
@@ -80,7 +85,7 @@ RUN wget -O kind "${KIND_URL}" && sha512sum -c kind.${ARCH}.sha512
 RUN chmod +x kind
 
 # Download k3d (see https://github.com/k3d-io/k3d/releases/latest)
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-k3d
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-k3d
 ARG ARCH
 ENV K3D_VERSION v5.8.3
 ENV K3D_URL https://storage.googleapis.com/skaffold/deps/k3d/${K3D_VERSION}/k3d-linux-amd64
@@ -89,7 +94,7 @@ RUN wget -O k3d "${K3D_URL}" && sha256sum -c k3d.${ARCH}.sha256
 RUN chmod +x k3d
 
 # Download gcloud (see https://cloud.google.com/sdk/docs/release-notes)
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-gcloud
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-gcloud
 ARG ARCH
 ENV GCLOUD_VERSION 520.0.0
 ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-GCLOUDARCH.tar.gz
@@ -102,7 +107,7 @@ RUN \
 RUN tar -zxf gcloud.tar.gz
 
 # Download bazel (see https://github.com/bazelbuild/bazel/releases/latest)
-FROM mirror.gcr.io/library/alpine:3.21.2 as download-bazel
+FROM ${BASE_PREFIX}alpine:3.21.2 as download-bazel
 ARG ARCH
 ENV BAZEL_VERSION 8.2.1
 ENV BAZEL_URL https://storage.googleapis.com/skaffold/deps/bazel/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-BAZELARCH
@@ -113,17 +118,18 @@ RUN \
     sha256sum -c bazel.${ARCH}.sha256
 RUN chmod +x bazel
 
-FROM mirror.gcr.io/library/ubuntu:24.04 as runtime_deps
+FROM ${BASE_PREFIX}ubuntu:24.04 as runtime_deps
 
 RUN apt-get update && \
     apt-get install --no-install-recommends --no-install-suggests -y \
     git python3 unzip && \
     rm -rf /var/lib/apt/lists/*
 
 # https://docs.docker.com/engine/release-notes
-COPY --from=mirror.gcr.io/library/docker:28.1.1 /usr/local/bin/docker /usr/local/bin/
+COPY --from=docker-source /usr/local/bin/docker /usr/local/bin/
 # https://hub.docker.com/r/docker/buildx-bin/tags
-COPY --from=mirror.gcr.io/docker/buildx-bin:0.23.0 /buildx /usr/libexec/docker/cli-plugins/docker-buildx
+COPY --from=buildx-source /buildx /usr/libexec/docker/cli-plugins/docker-buildx
+
 COPY --from=download-kubectl kubectl /usr/local/bin/
 COPY --from=download-helm helm /usr/local/bin/
 COPY --from=download-kustomize kustomize /usr/local/bin/
@@ -163,5 +169,7 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
     jq \
     apt-transport-https && \
     rm -rf /var/lib/apt/lists/*
-COPY --from=mirror.gcr.io/library/golang:1.25.5 /usr/local/go /usr/local/go
-ENV PATH /usr/local/go/bin:/root/go/bin:$PATH
+
+# Use the alias created at the top
+COPY --from=golang-source /usr/local/go /usr/local/go
+ENV PATH /usr/local/go/bin:/root/go/bin:$PATH

examples/compose/Dockerfile

@@ -1,12 +1,13 @@
-FROM mirror.gcr.io/library/golang:1.18 as builder
+ARG BASE_PREFIX=mirror.gcr.io/library/
+FROM ${BASE_PREFIX}golang:1.18 as builder
 WORKDIR /code
 COPY main.go .
 COPY go.mod .
 # `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
 ARG SKAFFOLD_GO_GCFLAGS
 RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -trimpath -o /app main.go
 
-FROM mirror.gcr.io/library/alpine:3
+FROM ${BASE_PREFIX}alpine:3
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
 ENV GOTRACEBACK=single

examples/cross-platform-builds/Dockerfile

@@ -1,12 +1,13 @@
-FROM mirror.gcr.io/library/golang:1.18 as builder
+ARG BASE_PREFIX=mirror.gcr.io/library/
+FROM ${BASE_PREFIX}golang:1.18 as builder
 WORKDIR /code
 COPY main.go .
 COPY go.mod .
 # `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
 ARG SKAFFOLD_GO_GCFLAGS
 RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -trimpath -o /app main.go
 
-FROM mirror.gcr.io/library/alpine:3
+FROM ${BASE_PREFIX}alpine:3
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
 ENV GOTRACEBACK=single

examples/custom-buildx/Dockerfile

@@ -1,3 +1,4 @@
+ARG BASE_PREFIX=mirror.gcr.io/library/
 # As Go supports cross-compilation, `--platform=$BUILDPLATFORM`
 # results in a dramatic speed-up as the build runs natively
 # instead of using emulation.
@@ -15,7 +16,7 @@ ARG TARGETOS
 ARG TARGETARCH
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -trimpath -o /app main.go
 
-FROM mirror.gcr.io/library/alpine:3
+FROM ${BASE_PREFIX}alpine:3
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
 ENV GOTRACEBACK=single

examples/custom-tests/Dockerfile

@@ -1,12 +1,13 @@
-FROM mirror.gcr.io/library/golang:1.18 as builder
+ARG BASE_PREFIX=mirror.gcr.io/library/
+FROM ${BASE_PREFIX}golang:1.18 as builder
 WORKDIR /code
 COPY main.go .
 COPY go.mod .
 # `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
 ARG SKAFFOLD_GO_GCFLAGS
 RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -trimpath -o /app main.go
 
-FROM mirror.gcr.io/library/alpine:3
+FROM ${BASE_PREFIX}alpine:3
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
 ENV GOTRACEBACK=single

examples/docker-deploy/bert/Dockerfile

@@ -1,12 +1,13 @@
-FROM mirror.gcr.io/library/golang:1.18 as builder
+ARG BASE_PREFIX=mirror.gcr.io/library/
+FROM ${BASE_PREFIX}golang:1.18 as builder
 WORKDIR /code
 COPY main.go .
 COPY go.mod .
 # `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
 ARG SKAFFOLD_GO_GCFLAGS
 RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -trimpath -o /app main.go
 
-FROM mirror.gcr.io/library/alpine:3.10
+FROM ${BASE_PREFIX}alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
 ENV GOTRACEBACK=single

examples/docker-deploy/ernie/Dockerfile

@@ -1,12 +1,13 @@
-FROM mirror.gcr.io/library/golang:1.18 as builder
+ARG BASE_PREFIX=mirror.gcr.io/library/
+FROM ${BASE_PREFIX}golang:1.18 as builder
 WORKDIR /code
 COPY main.go .
 COPY go.mod .
 # `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
 ARG SKAFFOLD_GO_GCFLAGS
 RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -trimpath -o /app main.go
 
-FROM mirror.gcr.io/library/alpine:3.10
+FROM ${BASE_PREFIX}alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
 ENV GOTRACEBACK=single

examples/gcb-kaniko/Dockerfile

@@ -1,12 +1,13 @@
-FROM mirror.gcr.io/library/golang:1.18 as builder
+ARG BASE_PREFIX=mirror.gcr.io/library/
+FROM ${BASE_PREFIX}golang:1.18 as builder
 WORKDIR /code
 COPY main.go .
 COPY go.mod .
 # `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
 ARG SKAFFOLD_GO_GCFLAGS
 RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -trimpath -o /app main.go
 
-FROM mirror.gcr.io/library/alpine:3
+FROM ${BASE_PREFIX}alpine:3
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
 ENV GOTRACEBACK=single

examples/generate-pipeline/Dockerfile

@@ -1,12 +1,13 @@
-FROM mirror.gcr.io/library/golang:1.18 as builder
+ARG BASE_PREFIX=mirror.gcr.io/library/
+FROM ${BASE_PREFIX}golang:1.18 as builder
 WORKDIR /code
 COPY main.go .
 COPY go.mod .
 # `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
 ARG SKAFFOLD_GO_GCFLAGS
 RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -trimpath -o /app main.go
 
-FROM mirror.gcr.io/library/alpine:3
+FROM ${BASE_PREFIX}alpine:3
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
 ENV GOTRACEBACK=single

examples/getting-started-kustomize/app/Dockerfile

@@ -1,12 +1,13 @@
-FROM mirror.gcr.io/library/golang:1.18 as builder
+ARG BASE_PREFIX=mirror.gcr.io/library/
+FROM ${BASE_PREFIX}golang:1.18 as builder
 WORKDIR /code
 COPY main.go .
 COPY go.mod .
 # `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations
 ARG SKAFFOLD_GO_GCFLAGS
 RUN go build -gcflags="${SKAFFOLD_GO_GCFLAGS}" -trimpath -o /app main.go
 
-FROM mirror.gcr.io/library/alpine:3.10
+FROM ${BASE_PREFIX}alpine:3.10
 # Define GOTRACEBACK to mark this container as using the Go language runtime
 # for `skaffold debug` (https://skaffold.dev/docs/workflows/debug/).
 ENV GOTRACEBACK=single