From: Wesley Coakley <wcoakley@nvidia.com>
Date: Wed, 20 Jan 2021 03:58:31 +0000 (-0500)
Subject: docker: prefer alpine:latest for building
X-Git-Tag: base_8.0~478^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=56518fad277c8589baad480d9c571a32d596ca9e;p=mirror%2Ffrr.git

docker: prefer alpine:latest for building

Building with alpine:edge caused some weirdness with our build
scripts, switching to the stable branch seems to have aleviated this.

We can also ditch the "edge" repositories as the main and community
repositories provide all packages we need

Signed-off-by: Wesley Coakley <wcoakley@nvidia.com>
---

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index ed6453e2b1..126710f8c2 100644
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -1,10 +1,9 @@
 # This stage builds a dist tarball from the source
-FROM alpine:edge as source-builder
+FROM alpine:latest as source-builder
 
 RUN mkdir -p /src/alpine
 COPY alpine/APKBUILD.in /src/alpine
 RUN source /src/alpine/APKBUILD.in \
-	&& echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
 	&& apk add \
 		--no-cache \
 		--update-cache \
@@ -22,10 +21,9 @@ RUN cd /src \
 	&& make dist
 
 # This stage builds an apk from the dist tarball
-FROM alpine:edge as alpine-builder
+FROM alpine:latest as alpine-builder
 # Don't use nocache here so that abuild can use the cache
-RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
-	&& apk add \
+RUN apk add \
 		--update-cache \
 		abuild \
 		alpine-conf \
@@ -46,11 +44,10 @@ RUN cd /dist \
 	&& abuild -r -P /pkgs/apk
 
 # This stage installs frr from the apk
-FROM alpine:edge
+FROM alpine:latest
 RUN mkdir -p /pkgs/apk
 COPY --from=alpine-builder /pkgs/apk/ /pkgs/apk/
-RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
-	&& apk add \
+RUN apk add \
 		--no-cache \
 		--update-cache \
 		tini \