Skip to content

Commit 4f2a7f2

Browse files
author
lijianguo
committed
fix(passport): error loading shared library libexpat.so.1
1 parent c075190 commit 4f2a7f2

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

rootfs/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ RUN apk add --update --virtual .build-deps \
1313
&& python3 -m venv /app/.venv \
1414
&& source /app/.venv/bin/activate \
1515
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
16-
&& find /app/.venv/lib/ -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
16+
&& find /app/.venv /usr/local -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
1717
| tr ',' '\n' \
1818
| sort -u \
19-
| awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
19+
| awk 'system("[[ -e /app/.venv/lib/" $1 " || -e /usr/local/lib/" $1 " ]]") == 0 { next } { print "so:" $1 }' \
2020
| xargs -rt apk add --no-cache --virtual .python-rundeps \
2121
&& apk add --update --virtual .controller-rundeps \
2222
ca-certificates \

rootfs/Dockerfile.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositor
2020
&& source /app/.venv/bin/activate \
2121
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
2222
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/dev_requirements.txt \
23-
&& find /app/.venv/lib/ -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
23+
&& find /app/.venv /usr/local -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
2424
| tr ',' '\n' \
2525
| sort -u \
26-
| awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
26+
| awk 'system("[[ -e /app/.venv/lib/" $1 " || -e /usr/local/lib/" $1 " ]]") == 0 { next } { print "so:" $1 }' \
2727
| xargs -rt apk add --no-cache --virtual .python-rundeps \
2828
&& apk add --update --virtual .controller-rundeps \
2929
git \

0 commit comments

Comments
 (0)