proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 01:57:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14123 from FRRouting/mergify/bp/stable/9.0/pr-14115

Browse Source 
docker: Adjustments for Alpine 3.18 and buildx (backport #14115)
This commit is contained in:
Donatas Abraitis 2023-08-01 13:38:36 +03:00 committed by GitHub
commit 6d97eedc03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/APKBUILD.in
View File

@ -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 expat fakeroot flex fortify-headers gdbm git gmp json-c-dev kmod
lddtree libacl libatomic libattr libblkid libburn libbz2 libc-dev lddtree libacl libatomic libattr libblkid libburn libbz2 libc-dev
libcap-dev libcurl libedit libffi libgcc libgomp libisoburn libisofs 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 linux-headers lzip lzo m4 make mkinitfs mpc1 mpfr4 mtools musl-dev
ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre2 ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre2
perl pkgconf python3 python3-dev readline readline-dev sqlite-libs pcre2-dev perl pkgconf python3 python3-dev readline readline-dev sqlite-libs pcre2-dev

4
docker/alpine/Dockerfile
View File

@ -28,7 +28,7 @@ FROM alpine:3.18 as source-builder
RUN mkdir -p /src/alpine /pkgs/apk RUN mkdir -p /src/alpine /pkgs/apk
COPY alpine/APKBUILD.in /src/alpine COPY alpine/APKBUILD.in /src/alpine
COPY --from=alpine-apk-builder-libyang /pkgs/apk/src /pkgs/apk 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 \ RUN source /src/alpine/APKBUILD.in \
&& apk add \ && apk add \
--no-cache \ --no-cache \
@ -48,7 +48,7 @@ RUN cd /src \
FROM alpine-builder as alpine-apk-builder FROM alpine-builder as alpine-apk-builder
COPY --from=source-builder /src/frr-*.tar.gz /src/alpine/* /dist/ COPY --from=source-builder /src/frr-*.tar.gz /src/alpine/* /dist/
COPY --from=alpine-apk-builder-libyang /pkgs/apk/src /pkgs/apk 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 find /pkgs/apk -type f -name APKINDEX.tar.gz -delete
RUN chown -R builder /dist /pkgs RUN chown -R builder /dist /pkgs
USER builder USER builder