Merge pull request #16222 from opensourcerouting/fix/docker_alpine_no…

…_grpc

docker: Adopt for Alpine Linux 3.20

alpine/APKBUILD.in

@@ -33,6 +33,8 @@ _libdir=/usr/lib
 _user=frr
 
 build() {
+	export ABUILD_APK_INDEX_OPTS="--allow-untrusted"
+
 	cd "$builddir"
 
 	./configure \

docker/alpine/Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # Create a basic stage set up to build APKs
-FROM alpine:3.19 as alpine-builder
+FROM alpine:3.20 as alpine-builder
 RUN apk add \
 		--update-cache \
 		abuild \
@@ -24,7 +24,7 @@ RUN cd /src/libyang \
 	&& abuild -r -P /pkgs/apk
 
 # This stage builds a dist tarball from the source
-FROM alpine:3.19 as source-builder
+FROM alpine:3.20 as source-builder
 RUN mkdir -p /src/alpine /pkgs/apk
 COPY alpine/APKBUILD.in /src/alpine
 COPY --from=alpine-apk-builder-libyang /pkgs/apk/src /pkgs/apk
@@ -57,7 +57,7 @@ RUN cd /dist \
 	&& abuild -r -P /pkgs/apk
 
 # This stage installs frr from the apk
-FROM alpine:3.19
+FROM alpine:3.20
 RUN mkdir -p /pkgs/apk
 COPY --from=alpine-apk-builder /pkgs/apk/ /pkgs/apk/
 RUN apk add \

docker/alpine/libyang/APKBUILD

@@ -11,6 +11,7 @@ makedepends="bison cmake cmocka-dev flex pcre2-dev"
 checkdepends="expect grep shunit2"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/CESNET/libyang/archive/v$pkgver.tar.gz"
+options="!check"
 
 # secfixes:
 #   1.0.215-r1:
@@ -21,6 +22,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/CESNET/libyang/archive/v$pkg
 #     - CVE-2021-28906
 
 build() {
+	export ABUILD_APK_INDEX_OPTS="--allow-untrusted"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi