Skip to content

Commit 7122dc2

Browse files
authored
pull images from mcr (#1347)
Signed-off-by: Evan Baker <[email protected]>
1 parent dd91f43 commit 7122dc2

File tree

13 files changed

+15
-25
lines changed

13 files changed

+15
-25
lines changed

.pipelines/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/ubuntu:16.04
1+
FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:18.04
22
RUN apt-get update && apt-get install -y software-properties-common sudo wget apt-utils apt-transport-https curl lsb-release gnupg jq
33
RUN wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
44
RUN dpkg -i packages-microsoft-prod.deb

Dockerfile.build

-9
This file was deleted.

Dockerfile.cnm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/ubuntu:16.04
1+
FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:18.04
22
ARG CNM_BUILD_DIR
33

44
# Install dependencies.

cni/telemetry/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# Use a minimal image as a parent image
2-
FROM docker.io/ubuntu:19.10
1+
FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04
32
ARG TELEMETRY_BUILD_DIR
43
ARG TELEMETRY_CONF_DIR
54

cns/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM docker.io/alpine:latest as certs
2-
RUN apk --update add ca-certificates
1+
FROM mcr.microsoft.com/cbl-mariner/base/core:1.0 as certs
2+
RUN tdnf upgrade -y && tdnf install -y ca-certificates
33

4-
FROM docker.io/golang:1.18 AS builder
4+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS builder
55
ARG VERSION
66
ARG CNS_AI_PATH
77
ARG CNS_AI_ID

cns/windows.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build cns
2-
FROM docker.io/golang:1.18 AS builder
2+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS builder
33
# Build args
44
ARG VERSION
55
ARG CNS_AI_PATH

hack/toolbox/Dockerfile.windows

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build cns
2-
FROM docker.io/golang:1.18 AS builder
2+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS builder
33
# Build args
44
ARG VERSION
55
ARG CNS_AI_PATH

hack/toolbox/manifests/Dockerfile.heavy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/ubuntu:20.04
1+
FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04
22
RUN apt-get update
33
RUN apt-get install -y \
44
python3 \

hack/toolbox/server/Dockerfile.heavy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/golang:alpine as build
1+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 as build
22
ADD ./ /
33
WORKDIR /
44
RUN CGO_ENABLED=0 GOOS=linux go build -o server .

hack/toolbox/server/Dockerfile.lite

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/golang as build
1+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 as build
22
ADD ./server/server.go /
33
WORKDIR /
44
RUN CGO_ENABLED=0 GOOS=linux go build -o server .

npm/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build npm
2-
FROM docker.io/golang:1.18 AS builder
2+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 AS builder
33
# Build args
44
ARG VERSION
55
ARG NPM_AI_PATH
@@ -14,7 +14,7 @@ COPY . .
1414
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
1515

1616
# Use a minimal image as a final image base
17-
FROM docker.io/ubuntu:focal
17+
FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04
1818

1919
# Copy into final image
2020
COPY --from=builder /usr/local/bin/azure-npm \

npm/Dockerfile.windows

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/golang:windowsservercore-ltsc2022 AS builder
1+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18-windowsservercore-ltsc2022 AS builder
22
# Build args
33
ARG VERSION
44
ARG NPM_AI_PATH

tools/acncli/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/golang:1.18 as build
1+
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.18 as build
22
WORKDIR /go/src/github.com/Azure/azure-container-networking/
33
ARG VERSION
44
ARG PLATFORM

0 commit comments

Comments
 (0)