From 5ed4c1b883527e36cc391f3d9584ed6d411f2594 Mon Sep 17 00:00:00 2001 From: Hunter Gregory Date: Wed, 13 Sep 2023 09:25:38 -0700 Subject: [PATCH 1/2] build: from ubuntu 20 (just adding whitespace) --- npm/linux.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/npm/linux.Dockerfile b/npm/linux.Dockerfile index 3bcd6132ff..691b800446 100644 --- a/npm/linux.Dockerfile +++ b/npm/linux.Dockerfile @@ -6,6 +6,7 @@ WORKDIR /usr/local/src 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 + FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04 COPY --from=builder /usr/local/bin/azure-npm /usr/bin/azure-npm COPY --from=builder /usr/local/src/npm/scripts /usr/local/npm From 7f1008f021a89f7d2bb4d4600b368242a58c0851 Mon Sep 17 00:00:00 2001 From: Hunter Gregory Date: Wed, 13 Sep 2023 09:31:43 -0700 Subject: [PATCH 2/2] build: update repo --- npm/linux.Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/npm/linux.Dockerfile b/npm/linux.Dockerfile index 691b800446..378c7218e3 100644 --- a/npm/linux.Dockerfile +++ b/npm/linux.Dockerfile @@ -6,8 +6,7 @@ WORKDIR /usr/local/src 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 - -FROM mcr.microsoft.com/oss/mirror/docker.io/library/ubuntu:20.04 +FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04 COPY --from=builder /usr/local/bin/azure-npm /usr/bin/azure-npm COPY --from=builder /usr/local/src/npm/scripts /usr/local/npm RUN apt-get update && apt-get install -y iptables ipset ca-certificates && apt-get autoremove -y && apt-get clean