diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index c225b951..dba9851a 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -13,10 +13,10 @@ RUN apk add --update --virtual .build-deps \ && python3 -m venv /app/.venv \ && source /app/.venv/bin/activate \ && pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \ - && find /app/.venv/lib/ -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ + && find /app/.venv /usr/local -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ | sort -u \ - | awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + | awk 'system("[[ -e /app/.venv/lib/" $1 " || -e /usr/local/lib/" $1 " ]]") == 0 { next } { print "so:" $1 }' \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk add --update --virtual .controller-rundeps \ ca-certificates \ diff --git a/rootfs/Dockerfile.test b/rootfs/Dockerfile.test index 3ef66c26..fd3f672f 100644 --- a/rootfs/Dockerfile.test +++ b/rootfs/Dockerfile.test @@ -20,10 +20,10 @@ RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositor && source /app/.venv/bin/activate \ && pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \ && pip3 install --disable-pip-version-check --no-cache-dir -r /app/dev_requirements.txt \ - && find /app/.venv/lib/ -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ + && find /app/.venv /usr/local -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \ | tr ',' '\n' \ | sort -u \ - | awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + | awk 'system("[[ -e /app/.venv/lib/" $1 " || -e /usr/local/lib/" $1 " ]]") == 0 { next } { print "so:" $1 }' \ | xargs -rt apk add --no-cache --virtual .python-rundeps \ && apk add --update --virtual .controller-rundeps \ git \