chore: use base images from mcr

Signed-off-by: Anish Ramasekar <[email protected]>
Azure · Dec 13, 2023 · 41fb0e0 · 41fb0e0
1 parent a93f474
commit 41fb0e0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 22 deletions.
diff --git a/docker/proxy-init.Dockerfile b/docker/proxy-init.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} registry.k8s.io/build-image/distroless-iptables:v0.4.2
+FROM --platform=${TARGETPLATFORM:-linux/amd64} registry.k8s.io/build-image/distroless-iptables:v0.4.3
 
 COPY ./init/init-iptables.sh /bin/
 RUN chmod +x /bin/init-iptables.sh

diff --git a/docker/proxy.Dockerfile b/docker/proxy.Dockerfile
@@ -1,7 +1,6 @@
-ARG BUILDER=mcr.microsoft.com/oss/go/microsoft/golang:1.21-bullseye
-ARG BASEIMAGE=gcr.io/distroless/static:nonroot
+ARG BASEIMAGE=mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0-nonroot
 
-FROM ${BUILDER} as builder
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21-bookworm as builder
 
 ARG LDFLAGS
 
@@ -21,8 +20,6 @@ COPY pkg/ pkg/
 ARG TARGETARCH
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a -ldflags "${LDFLAGS:--X github.com/Azure/azure-workload-identity/pkg/version.BuildVersion=latest}" -o proxy main.go
 
-# Use distroless as minimal base image to package the manager binary
-# Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ${BASEIMAGE}
 WORKDIR /
 COPY --from=builder /workspace/proxy .

diff --git a/docker/webhook.Dockerfile b/docker/webhook.Dockerfile
@@ -1,8 +1,7 @@
-ARG BUILDER=mcr.microsoft.com/oss/go/microsoft/golang:1.21-bullseye
-ARG BASEIMAGE=gcr.io/distroless/static:nonroot
+ARG BASEIMAGE=mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0-nonroot
 
 # Build the manager binary
-FROM ${BUILDER} as builder
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21-bookworm as builder
 
 ARG LDFLAGS
 
@@ -22,8 +21,6 @@ COPY pkg/ pkg/
 ARG TARGETARCH
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a -ldflags "${LDFLAGS:--X github.com/Azure/azure-workload-identity/pkg/version.BuildVersion=latest}" -o manager main.go
 
-# Use distroless as minimal base image to package the manager binary
-# Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ${BASEIMAGE}
 WORKDIR /
 COPY --from=builder /workspace/manager .

diff --git a/examples/msal-go/Dockerfile b/examples/msal-go/Dockerfile
@@ -1,7 +1,6 @@
-ARG BUILDER=mcr.microsoft.com/oss/go/microsoft/golang:1.21-bullseye
-ARG BASEIMAGE=gcr.io/distroless/static:nonroot
+ARG BASEIMAGE=mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0-nonroot
 
-FROM ${BUILDER} as builder
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21-bookworm as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -19,8 +18,6 @@ COPY token_credential.go token_credential.go
 ARG TARGETARCH
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a -o msalgo .
 
-# Use distroless as minimal base image to package the manager binary
-# Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ${BASEIMAGE}
 WORKDIR /
 COPY --from=builder /workspace/msalgo .

diff --git a/examples/msal-go/windows.Dockerfile b/examples/msal-go/windows.Dockerfile
@@ -1,8 +1,7 @@
-ARG BUILDER=mcr.microsoft.com/oss/go/microsoft/golang:1.21-bullseye
 ARG SERVERCORE_CACHE=gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OS_VERSION:-1809}
 ARG BASEIMAGE=mcr.microsoft.com/windows/nanoserver:${OS_VERSION:-1809}
 
-FROM --platform=linux/amd64 ${BUILDER} as builder
+FROM --platform=linux/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.21-bookworm
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/examples/msal-node/Dockerfile b/examples/msal-node/Dockerfile
@@ -1,8 +1,6 @@
-ARG BUILDER=mcr.microsoft.com/cbl-mariner/base/nodejs:16
 ARG BASEIMAGE=mcr.microsoft.com/mirror/gcr/distroless/nodejs-debian11:16
 
-# ref: https://github.com/GoogleContainerTools/distroless/blob/main/examples/nodejs/Dockerfile
-FROM ${BUILDER} AS build-env
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.21-bookworm as build-env
 ADD . /app
 WORKDIR /app
 RUN npm install

diff --git a/examples/msal-python/Dockerfile b/examples/msal-python/Dockerfile
@@ -1,5 +1,5 @@
 ARG BUILDER=debian:11-slim
-ARG BASEIMAGE=gcr.io/distroless/python3-debian11
+ARG BASEIMAGE=mcr.microsoft.com/cbl-mariner/distroless/python:3.9
 
 # ref: https://github.com/GoogleContainerTools/distroless/blob/main/examples/python3-requirements/Dockerfile
 FROM ${BUILDER}  AS build