mirror of
https://git.proxmox.com/git/mirror_frr
synced 2026-03-24 10:13:15 +00:00
Merge pull request #11271 from opensourcerouting/fix/docker_build_alpine
docker: Use Alpine 3.15 for build
This commit is contained in:
commit
0f279e96ef
@ -1,7 +1,7 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
# Create a basic stage set up to build APKs
|
# Create a basic stage set up to build APKs
|
||||||
FROM alpine:3.13 as alpine-builder
|
FROM alpine:3.15 as alpine-builder
|
||||||
RUN apk add \
|
RUN apk add \
|
||||||
--update-cache \
|
--update-cache \
|
||||||
abuild \
|
abuild \
|
||||||
@ -22,7 +22,7 @@ RUN cd /libyang \
|
|||||||
&& abuild -r -P /pkgs/apk
|
&& abuild -r -P /pkgs/apk
|
||||||
|
|
||||||
# This stage builds a dist tarball from the source
|
# This stage builds a dist tarball from the source
|
||||||
FROM alpine:3.13 as source-builder
|
FROM alpine:3.15 as source-builder
|
||||||
|
|
||||||
RUN mkdir -p /src/alpine
|
RUN mkdir -p /src/alpine
|
||||||
COPY alpine/APKBUILD.in /src/alpine
|
COPY alpine/APKBUILD.in /src/alpine
|
||||||
@ -33,6 +33,7 @@ RUN source /src/alpine/APKBUILD.in \
|
|||||||
$makedepends \
|
$makedepends \
|
||||||
gzip \
|
gzip \
|
||||||
py-pip \
|
py-pip \
|
||||||
|
rtrlib \
|
||||||
&& pip install pytest
|
&& pip install pytest
|
||||||
|
|
||||||
RUN mkdir -p /pkgs/apk
|
RUN mkdir -p /pkgs/apk
|
||||||
@ -66,7 +67,7 @@ RUN cd /dist \
|
|||||||
&& abuild -r -P /pkgs/apk
|
&& abuild -r -P /pkgs/apk
|
||||||
|
|
||||||
# This stage installs frr from the apk
|
# This stage installs frr from the apk
|
||||||
FROM alpine:3.13
|
FROM alpine:3.15
|
||||||
RUN mkdir -p /pkgs/apk
|
RUN mkdir -p /pkgs/apk
|
||||||
COPY --from=frr-apk-builder /pkgs/apk/ /pkgs/apk/
|
COPY --from=frr-apk-builder /pkgs/apk/ /pkgs/apk/
|
||||||
RUN apk add \
|
RUN apk add \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user