From 81755646e264bc5b68c40b6dcc21c087dcb8dd04 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Mon, 11 Mar 2019 12:10:49 +0000 Subject: [PATCH] push up nasty bandaid fix for armhf, using python3 lib alpine:3.8 --- Dockerfile.armhf | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 0bfc8ba..23356a0 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -46,10 +46,6 @@ FROM lsiobase/alpine.armhf:${ALPINE_VER} as beets_build-stage ############## beets build stage ############## -# copy artifacts from fetch stage -COPY --from=fetch-stage /tmp/beets-src /tmp/beets-src -COPY --from=fetch-stage /tmp/copyartifacts-src /tmp/copyartifacts-src - # set workdir for beets install WORKDIR /tmp/beets-src @@ -59,6 +55,11 @@ RUN \ py3-setuptools \ python3-dev +# copy artifacts from fetch stage and apply bandaid +COPY --from=fetch-stage /tmp/beets-src /tmp/beets-src +COPY --from=fetch-stage /tmp/copyartifacts-src /tmp/copyartifacts-src +COPY bandaid/armhf/ /usr/lib/ + # build beets package RUN \ set -ex && \ @@ -140,6 +141,9 @@ RUN \ py3-pip \ python3-dev +# apply bandaid +COPY bandaid/armhf/ /usr/lib/ + # install pip packages RUN \ set -ex && \ @@ -198,8 +202,9 @@ ARG BEETS_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="sparklyballs" -# copy artifacts strip stage +# copy artifacts strip stage and apply bandaid COPY --from=strip-stage /build/all/usr/ /usr/ +COPY bandaid/armhf/ /usr/lib/ # install runtime packages RUN \