Skip to content

Commit 8f9d6b3

Browse files
authored
use fully-qualified image names in all Dockerfiles (#1248)
Signed-off-by: Evan Baker <[email protected]>
1 parent d8b4ce2 commit 8f9d6b3

File tree

14 files changed

+21
-21
lines changed

14 files changed

+21
-21
lines changed

.pipelines/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM docker.io/ubuntu:16.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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM golang:1.17
1+
FROM docker.io/golang:1.17
22

33
RUN apt-get update \
4-
&& apt-get install -y zip \
5-
&& apt-get install -y sudo libltdl-dev
4+
&& apt-get install -y zip \
5+
&& apt-get install -y sudo libltdl-dev
66

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

Dockerfile.cnm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM docker.io/ubuntu:16.04
22
ARG CNM_BUILD_DIR
33

44
# Install dependencies.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ container-platform-tag: # util target to print the container tag
175175
@echo $(subst /,-,$(PLATFORM))-$(TAG)
176176

177177
containerize-buildah: # util target to build container images using buildah. do not invoke directly.
178-
buildah build \
178+
buildah bud \
179179
--jobs 16 \
180180
--platform $(PLATFORM) \
181181
-f $(DOCKERFILE) \

cni/telemetry/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use a minimal image as a parent image
2-
FROM ubuntu:19.10
2+
FROM docker.io/ubuntu:19.10
33
ARG TELEMETRY_BUILD_DIR
44
ARG TELEMETRY_CONF_DIR
55

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

1212
# Run below command by default when the container starts.
13-
ENTRYPOINT ["/usr/bin/azure-vnet-telemetry", "-d", "/usr/bin"]
13+
ENTRYPOINT ["/usr/bin/azure-vnet-telemetry", "-d", "/usr/bin"]

cns/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM alpine:latest as certs
1+
FROM docker.io/alpine:latest as certs
22
RUN apk --update add ca-certificates
33

4-
FROM golang:1.17 AS builder
4+
FROM docker.io/golang:1.17 AS builder
55
ARG VERSION
66
ARG CNS_AI_PATH
77
ARG CNS_AI_ID

cns/windows.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build cns
2-
FROM golang:1.17 AS builder
2+
FROM docker.io/golang:1.17 AS builder
33
# Build args
44
ARG VERSION
55
ARG CNS_AI_PATH

hack/toolbox/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build cns
2-
FROM golang:1.17 AS builder
2+
FROM docker.io/golang:1.17 AS builder
33
# Build args
44
ARG VERSION
55
ARG CNS_AI_PATH

hack/toolbox/manifests/Dockerfile.heavy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM docker.io/ubuntu:20.04
22
RUN apt-get update
33
RUN apt-get install -y \
44
python3 \
@@ -33,4 +33,4 @@ ENV PATH="/root/go/bin/:${PATH}"
3333
ADD ./server.go /app/
3434
WORKDIR /app
3535
RUN go build -o main .
36-
CMD ["./main"]
36+
CMD ["./main"]

hack/toolbox/server/Dockerfile.heavy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM golang:alpine as build
1+
FROM docker.io/golang:alpine as build
22
ADD ./ /
33
WORKDIR /
44
RUN CGO_ENABLED=0 GOOS=linux go build -o server .
55

6-
FROM alpine:latest
6+
FROM docker.io/alpine:latest
77
RUN apk update
88
RUN apk add \
99
axel \

0 commit comments

Comments
 (0)