diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-05-24 17:10:00 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-05-24 17:10:00 +0200 |
| commit | e59e44bacd3768af2f9c03141c0836af7a274166 (patch) | |
| tree | cc778ebad5301557f6c9d6464aea9b5d891f1284 /docker | |
| parent | Merge pull request #11256 from opensourcerouting/feature/bgp_rpki_json (diff) | |
| download | frr-e59e44bacd3768af2f9c03141c0836af7a274166.tar.xz frr-e59e44bacd3768af2f9c03141c0836af7a274166.zip | |
docker: Use Alpine 3.15 for build
This has librtr 0.8.0, while 3.13 has 0.7.0.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/alpine/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 79ae31567..fa4b9859b 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 # 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 \ --update-cache \ abuild \ @@ -22,7 +22,7 @@ RUN cd /libyang \ && abuild -r -P /pkgs/apk # 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 COPY alpine/APKBUILD.in /src/alpine @@ -33,6 +33,7 @@ RUN source /src/alpine/APKBUILD.in \ $makedepends \ gzip \ py-pip \ + rtrlib \ && pip install pytest RUN mkdir -p /pkgs/apk @@ -66,7 +67,7 @@ RUN cd /dist \ && abuild -r -P /pkgs/apk # This stage installs frr from the apk -FROM alpine:3.13 +FROM alpine:3.15 RUN mkdir -p /pkgs/apk COPY --from=frr-apk-builder /pkgs/apk/ /pkgs/apk/ RUN apk add \ |