From 3d0dd4d7e39b0f70639e765eeb96a1a95f92ab4d Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Mon, 31 Jul 2023 11:04:30 +0300 Subject: [PATCH 1/2] docker: Use openssl instead of libressl libressl is dropped from Alpine 3.18 for s390x. Signed-off-by: Donatas Abraitis (cherry picked from commit 617b450d0131e7925bb407fc7f4375c10fac426b) --- alpine/APKBUILD.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in index 63fb5c46b9..9a29ff3a96 100644 --- a/alpine/APKBUILD.in +++ b/alpine/APKBUILD.in @@ -13,7 +13,7 @@ makedepends="ncurses-dev net-snmp-dev gawk texinfo perl expat fakeroot flex fortify-headers gdbm git gmp json-c-dev kmod lddtree libacl libatomic libattr libblkid libburn libbz2 libc-dev libcap-dev libcurl libedit libffi libgcc libgomp libisoburn libisofs - libltdl libressl libssh2 libstdc++ libtool libuuid + libltdl openssl libssh2 libstdc++ libtool libuuid linux-headers lzip lzo m4 make mkinitfs mpc1 mpfr4 mtools musl-dev ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre2 perl pkgconf python3 python3-dev readline readline-dev sqlite-libs pcre2-dev From df9c77a638025ba6576f42b1e0af029b2c659323 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Mon, 31 Jul 2023 11:05:15 +0300 Subject: [PATCH 2/2] docker: Install the apk packages regardless of the platform It was hardcoded to x86_64, but we build Alpine images for more platforms, let's be dynamical here. Signed-off-by: Donatas Abraitis (cherry picked from commit 18becdc29e9898dc33806d072ed45c7ca9d45de2) --- docker/alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index d1c3060069..98e8407498 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -28,7 +28,7 @@ FROM alpine:3.18 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 -RUN cd /pkgs/apk/x86_64 && apk add --allow-untrusted *.apk +RUN cd /pkgs/apk && apk add --allow-untrusted */*.apk RUN source /src/alpine/APKBUILD.in \ && apk add \ --no-cache \ @@ -48,7 +48,7 @@ RUN cd /src \ FROM alpine-builder as alpine-apk-builder COPY --from=source-builder /src/frr-*.tar.gz /src/alpine/* /dist/ COPY --from=alpine-apk-builder-libyang /pkgs/apk/src /pkgs/apk -RUN cd /pkgs/apk/x86_64 && apk add --allow-untrusted *.apk +RUN cd /pkgs/apk && apk add --allow-untrusted */*.apk RUN find /pkgs/apk -type f -name APKINDEX.tar.gz -delete RUN chown -R builder /dist /pkgs USER builder