Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pipelines/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 0 additions & 9 deletions Dockerfile.build

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile.cnm
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 1 addition & 2 deletions cni/telemetry/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions cns/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cns/windows.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/toolbox/Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/toolbox/manifests/Dockerfile.heavy
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion hack/toolbox/server/Dockerfile.heavy
Original file line number Diff line number Diff line change
@@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion hack/toolbox/server/Dockerfile.lite
Original file line number Diff line number Diff line change
@@ -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 .
Expand Down
4 changes: 2 additions & 2 deletions npm/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion npm/Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/acncli/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down