diff --git a/.pipelines/Dockerfile b/.pipelines/Dockerfile index 3814f8a5e0..de6ea4ac25 100644 --- a/.pipelines/Dockerfile +++ b/.pipelines/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/ubuntu:16.04 +FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:18.04 RUN apt-get update && apt-get install -y software-properties-common sudo wget apt-utils apt-transport-https curl lsb-release gnupg jq RUN wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb RUN dpkg -i packages-microsoft-prod.deb diff --git a/Dockerfile.build b/Dockerfile.build deleted file mode 100644 index 7f3af09a7b..0000000000 --- a/Dockerfile.build +++ /dev/null @@ -1,9 +0,0 @@ -FROM docker.io/golang:1.18 - -RUN apt-get update \ - && apt-get install -y zip \ - && apt-get install -y sudo libltdl-dev - -COPY . /go/src/github.com/Azure/azure-container-networking - -WORKDIR /go/src/github.com/Azure/azure-container-networking diff --git a/Dockerfile.cnm b/Dockerfile.cnm index 4a24eaf4b6..98e978be29 100644 --- a/Dockerfile.cnm +++ b/Dockerfile.cnm @@ -1,4 +1,4 @@ -FROM docker.io/ubuntu:16.04 +FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:18.04 ARG CNM_BUILD_DIR # Install dependencies. diff --git a/cni/telemetry/Dockerfile b/cni/telemetry/Dockerfile index 5076857c65..6bc205eaed 100644 --- a/cni/telemetry/Dockerfile +++ b/cni/telemetry/Dockerfile @@ -1,5 +1,4 @@ -# Use a minimal image as a parent image -FROM docker.io/ubuntu:19.10 +FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04 ARG TELEMETRY_BUILD_DIR ARG TELEMETRY_CONF_DIR diff --git a/cns/Dockerfile b/cns/Dockerfile index 89cb369d82..d4f73e5013 100644 --- a/cns/Dockerfile +++ b/cns/Dockerfile @@ -1,7 +1,7 @@ -FROM docker.io/alpine:latest as certs -RUN apk --update add ca-certificates +FROM mcr.microsoft.com/cbl-mariner/base/core:1.0 as certs +RUN tdnf upgrade -y && tdnf install -y ca-certificates -FROM docker.io/golang:1.18 AS builder +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS builder ARG VERSION ARG CNS_AI_PATH ARG CNS_AI_ID diff --git a/cns/windows.Dockerfile b/cns/windows.Dockerfile index 7dcbc1d224..47ae1c7ad9 100644 --- a/cns/windows.Dockerfile +++ b/cns/windows.Dockerfile @@ -1,5 +1,5 @@ # Build cns -FROM docker.io/golang:1.18 AS builder +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS builder # Build args ARG VERSION ARG CNS_AI_PATH diff --git a/hack/toolbox/Dockerfile.windows b/hack/toolbox/Dockerfile.windows index afdc87f2de..58a36490bc 100644 --- a/hack/toolbox/Dockerfile.windows +++ b/hack/toolbox/Dockerfile.windows @@ -1,5 +1,5 @@ # Build cns -FROM docker.io/golang:1.18 AS builder +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS builder # Build args ARG VERSION ARG CNS_AI_PATH diff --git a/hack/toolbox/manifests/Dockerfile.heavy b/hack/toolbox/manifests/Dockerfile.heavy index 443f62fcc7..4facd58202 100644 --- a/hack/toolbox/manifests/Dockerfile.heavy +++ b/hack/toolbox/manifests/Dockerfile.heavy @@ -1,4 +1,4 @@ -FROM docker.io/ubuntu:20.04 +FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04 RUN apt-get update RUN apt-get install -y \ python3 \ diff --git a/hack/toolbox/server/Dockerfile.heavy b/hack/toolbox/server/Dockerfile.heavy index 62be6ffc6d..40084e22f7 100644 --- a/hack/toolbox/server/Dockerfile.heavy +++ b/hack/toolbox/server/Dockerfile.heavy @@ -1,4 +1,4 @@ -FROM docker.io/golang:alpine as build +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 as build ADD ./ / WORKDIR / RUN CGO_ENABLED=0 GOOS=linux go build -o server . diff --git a/hack/toolbox/server/Dockerfile.lite b/hack/toolbox/server/Dockerfile.lite index f42883f990..e4f3724f38 100644 --- a/hack/toolbox/server/Dockerfile.lite +++ b/hack/toolbox/server/Dockerfile.lite @@ -1,4 +1,4 @@ -FROM docker.io/golang as build +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 as build ADD ./server/server.go / WORKDIR / RUN CGO_ENABLED=0 GOOS=linux go build -o server . diff --git a/npm/Dockerfile b/npm/Dockerfile index 1df3c12e22..87679182c8 100644 --- a/npm/Dockerfile +++ b/npm/Dockerfile @@ -1,5 +1,5 @@ # Build npm -FROM docker.io/golang:1.18 AS builder +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS builder # Build args ARG VERSION ARG NPM_AI_PATH @@ -14,7 +14,7 @@ COPY . . RUN CGO_ENABLED=1 go build -v -o /usr/local/bin/azure-npm -ldflags "-X main.version="$VERSION" -X "$NPM_AI_PATH"="$NPM_AI_ID"" -gcflags="-dwarflocationlists=true" npm/cmd/*.go # Use a minimal image as a final image base -FROM docker.io/ubuntu:focal +FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04 # Copy into final image COPY --from=builder /usr/local/bin/azure-npm \ diff --git a/npm/Dockerfile.windows b/npm/Dockerfile.windows index c526548233..c63b029e4c 100644 --- a/npm/Dockerfile.windows +++ b/npm/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM docker.io/golang:windowsservercore-ltsc2022 AS builder +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18-windowsservercore-ltsc2022 AS builder # Build args ARG VERSION ARG NPM_AI_PATH diff --git a/tools/acncli/Dockerfile b/tools/acncli/Dockerfile index 9b2f30f3fe..e9f9b9156e 100644 --- a/tools/acncli/Dockerfile +++ b/tools/acncli/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/golang:1.18 as build +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 as build WORKDIR /go/src/github.com/Azure/azure-container-networking/ ARG VERSION ARG PLATFORM