manibuilder/alpine: Fix building images w/o libjaylink
If not all packages can be installed with an `apk add` command, none
are. We'd have to run `apk` multiple times. However, `libgpiod` and
`meson` are available in all used releases now, so we can always
install them.
Change-Id: I992b8f47a6b670a150228417a41281abe14ac27e
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.sourcearcade.org/c/flashprog/+/368
diff --git a/util/manibuilder/Dockerfile.alpine b/util/manibuilder/Dockerfile.alpine
index 32e6436..e774ffb 100644
--- a/util/manibuilder/Dockerfile.alpine
+++ b/util/manibuilder/Dockerfile.alpine
@@ -8,13 +8,14 @@
apk update && \
apk add build-base linux-headers git ccache \
pciutils-dev libusb-dev libftdi1-dev \
+ libgpiod-dev meson \
${ADDITIONAL_PACKAGES} && \
if [ ! -h /etc/ssl/cert.pem ]; then \
rm -f /etc/ssl/certs/*; \
ln -sf /etc/ssl/cert.pem /etc/ssl/certs/ca-certificates.crt; \
fi
-RUN apk add libjaylink-dev libgpiod-dev meson || true
+RUN apk add libjaylink-dev || true
# fix weird permissions in armhf-v3.11
RUN [ -d /usr/share/git-core/templates ] && \