diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-05-24 17:49:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-24 17:49:33 -0400 |
| commit | 0f279e96efe6f53e035545f6b27db652f9c565ca (patch) | |
| tree | 260af8882162dd363cb162e0d36dfaac20236e46 | |
| parent | e1978457120038a9012d53ea2245b302c7c45d3b (diff) | |
| parent | e59e44bacd3768af2f9c03141c0836af7a274166 (diff) | |
Merge pull request #11271 from opensourcerouting/fix/docker_build_alpine
docker: Use Alpine 3.15 for build
| -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 79ae315679..fa4b9859b9 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 \ |