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 ubuntu:16.04
FROM docker.io/ubuntu:16.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
6 changes: 3 additions & 3 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.17
FROM docker.io/golang:1.17

RUN apt-get update \
&& apt-get install -y zip \
&& apt-get install -y sudo libltdl-dev
&& apt-get install -y zip \
&& apt-get install -y sudo libltdl-dev

COPY . /go/src/github.com/Azure/azure-container-networking

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.cnm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM docker.io/ubuntu:16.04
ARG CNM_BUILD_DIR

# Install dependencies.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ container-platform-tag: # util target to print the container tag
@echo $(subst /,-,$(PLATFORM))-$(TAG)

containerize-buildah: # util target to build container images using buildah. do not invoke directly.
buildah build \
buildah bud \
--jobs 16 \
--platform $(PLATFORM) \
-f $(DOCKERFILE) \
Expand Down
4 changes: 2 additions & 2 deletions cni/telemetry/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use a minimal image as a parent image
FROM ubuntu:19.10
FROM docker.io/ubuntu:19.10
ARG TELEMETRY_BUILD_DIR
ARG TELEMETRY_CONF_DIR

Expand All @@ -10,4 +10,4 @@ COPY $TELEMETRY_CONF_DIR/azure-vnet-telemetry.config /usr/bin
WORKDIR /usr/bin

# Run below command by default when the container starts.
ENTRYPOINT ["/usr/bin/azure-vnet-telemetry", "-d", "/usr/bin"]
ENTRYPOINT ["/usr/bin/azure-vnet-telemetry", "-d", "/usr/bin"]
4 changes: 2 additions & 2 deletions cns/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:latest as certs
FROM docker.io/alpine:latest as certs
RUN apk --update add ca-certificates

FROM golang:1.17 AS builder
FROM docker.io/golang:1.17 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 golang:1.17 AS builder
FROM docker.io/golang:1.17 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 golang:1.17 AS builder
FROM docker.io/golang:1.17 AS builder
# Build args
ARG VERSION
ARG CNS_AI_PATH
Expand Down
4 changes: 2 additions & 2 deletions hack/toolbox/manifests/Dockerfile.heavy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM docker.io/ubuntu:20.04
RUN apt-get update
RUN apt-get install -y \
python3 \
Expand Down Expand Up @@ -33,4 +33,4 @@ ENV PATH="/root/go/bin/:${PATH}"
ADD ./server.go /app/
WORKDIR /app
RUN go build -o main .
CMD ["./main"]
CMD ["./main"]
4 changes: 2 additions & 2 deletions hack/toolbox/server/Dockerfile.heavy
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM golang:alpine as build
FROM docker.io/golang:alpine as build
ADD ./ /
WORKDIR /
RUN CGO_ENABLED=0 GOOS=linux go build -o server .

FROM alpine:latest
FROM docker.io/alpine:latest
RUN apk update
RUN apk add \
axel \
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 golang as build
FROM docker.io/golang 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 golang:1.17 AS builder
FROM docker.io/golang:1.17 AS builder
# Build args
ARG VERSION
ARG NPM_AI_PATH
Expand All @@ -14,7 +14,7 @@ COPY . .
RUN CGO_ENABLED=0 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 ubuntu:focal
FROM docker.io/ubuntu:focal

# 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 golang:windowsservercore-ltsc2022 AS builder
FROM docker.io/golang: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 golang:1.17 as build
FROM docker.io/golang:1.17 as build
WORKDIR /go/src/github.com/Azure/azure-container-networking/
ARG VERSION
ARG PLATFORM
Expand Down