diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2021-04-18 08:50:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-18 08:50:20 +0200 |
| commit | 79ec61be278b1af8fd9da0f9494bc91be0c3384d (patch) | |
| tree | 9d9b21ca8d94d7a928ebb3cd59722591e5501263 | |
| parent | 6e0368f61af5f63cce4c4bef1dee72db958ea59e (diff) | |
| parent | 9513086d4e3159ab2685bbe97f8b22bb930e3086 (diff) | |
Merge pull request #8491 from qlyoung/fix-alpine-libelf-dev-build
| -rw-r--r-- | alpine/APKBUILD.in | 2 | ||||
| -rw-r--r-- | docker/alpine/Dockerfile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in index d6c6c5f0af..dfedf0b52b 100644 --- a/alpine/APKBUILD.in +++ b/alpine/APKBUILD.in @@ -18,7 +18,7 @@ makedepends="ncurses-dev net-snmp-dev gawk texinfo perl ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre perl pkgconf python3 python3-dev readline readline-dev sqlite-libs squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib rtrlib-dev - py3-sphinx" + py3-sphinx elfutils elfutils-dev" checkdepends="pytest py-setuptools" install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 126710f8c2..56ac1c0d00 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,5 +1,5 @@ # This stage builds a dist tarball from the source -FROM alpine:latest as source-builder +FROM alpine:3.13 as source-builder RUN mkdir -p /src/alpine COPY alpine/APKBUILD.in /src/alpine @@ -21,7 +21,7 @@ RUN cd /src \ && make dist # This stage builds an apk from the dist tarball -FROM alpine:latest as alpine-builder +FROM alpine:3.13 as alpine-builder # Don't use nocache here so that abuild can use the cache RUN apk add \ --update-cache \ @@ -44,7 +44,7 @@ RUN cd /dist \ && abuild -r -P /pkgs/apk # This stage installs frr from the apk -FROM alpine:latest +FROM alpine:3.13 RUN mkdir -p /pkgs/apk COPY --from=alpine-builder /pkgs/apk/ /pkgs/apk/ RUN apk add \ |