Merge pull request #15457 from opensourcerouting/fix/docker_builds_fo…

…r_10.0

docker: Fix build for Alpine Linux after the recent changes since 9.1

alpine/APKBUILD.in

@@ -27,6 +27,7 @@ source="$pkgname-$pkgver.tar.gz"
 
 builddir="$srcdir"/$pkgname-$pkgver
 
+_sysconfdir=/etc
 _sbindir=/usr/lib/frr
 _libdir=/usr/lib
 _user=frr
@@ -36,7 +37,7 @@ build() {
 
 	./configure \
 		--prefix=/usr \
-		--sysconfdir=/etc \
+		--sysconfdir=$_sysconfdir \
 		--localstatedir=/var \
 		--sbindir=$_sbindir \
 		--libdir=$_libdir \
@@ -61,7 +62,9 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
-	install -Dm644 "$builddir"/tools/etc/frr/daemons "$pkgdir"$_sysconfdir/daemons
-	install -d "$pkgdir"/etc/init.d
-	ln -s ${_sbindir}/frr "$pkgdir"/etc/init.d/frr
+	install -d $pkgdir/$_sysconfdir/frr
+	install -m 0644 tools/etc/frr/daemons $pkgdir/$_sysconfdir/frr/daemons
+
+	install -d $pkgdir/$_sysconfdir/init.d
+	ln -s ${_sbindir}/frr $pkgdir/$_sysconfdir/init.d/frr
 }

docker/alpine/Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # Create a basic stage set up to build APKs
-FROM alpine:3.18 as alpine-builder
+FROM alpine:3.19 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.18 as source-builder
+FROM alpine:3.19 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
@@ -33,8 +33,7 @@ RUN source /src/alpine/APKBUILD.in \
 	&& apk add \
 		--no-cache \
 		--update-cache \
-		$makedepends \
-	&& pip install pytest
+		$makedepends
 COPY . /src
 ARG PKGVER
 RUN cd /src \
@@ -58,7 +57,7 @@ RUN cd /dist \
 	&& abuild -r -P /pkgs/apk
 
 # This stage installs frr from the apk
-FROM alpine:3.18
+FROM alpine:3.19
 RUN mkdir -p /pkgs/apk
 COPY --from=alpine-apk-builder /pkgs/apk/ /pkgs/apk/
 RUN apk add \

docker/alpine/libyang/APKBUILD

@@ -1,7 +1,7 @@
 # Contributor: Sören Tempel <[email protected]>
 # Maintainer: Christian Franke <[email protected]>
 pkgname=libyang
-pkgver=2.1.80
+pkgver=2.1.128
 pkgrel=0
 pkgdesc="YANG data modelling language parser and toolkit"
 url="https://github.com/CESNET/libyang"