Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix several Alpine build issues related to ELF parsing #8491

Merged
merged 2 commits into from Apr 18, 2021
Merged

Fix several Alpine build issues related to ELF parsing #8491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daff938
alpine: add missing libelf-dev dependency
qlyoung Apr 15, 2021
9513086
docker: pin alpine base image to 3.13
qlyoung Apr 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion alpine/APKBUILD.in
View file
Open in desktop
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions docker/alpine/Dockerfile
View file
Open in desktop
@@ -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
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down