Skip to content

Commit 9cc7d0a

Browse files
author
lijianguo
committed
fix(passport): error loading shared library libexpat.so.1
1 parent d4ebced commit 9cc7d0a

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
@@ -14,10 +14,10 @@ RUN apk add --update --virtual .build-deps \
1414
&& python3 -m venv /app/.venv \
1515
&& source /app/.venv/bin/activate \
1616
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
17-
&& find /app/.venv/lib/ -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
17+
&& find /app/.venv /usr/local -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
1818
| tr ',' '\n' \
1919
| sort -u \
20-
| awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
20+
| awk 'system("[[ -e /app/.venv/lib/" $1 " || -e /usr/local/lib/" $1 " ]]") == 0 { next } { print "so:" $1 }' \
2121
| xargs -rt apk add --no-cache --virtual .python-rundeps \
2222
&& apk add --update --virtual .helmbroker-rundeps \
2323
$runDeps \

rootfs/Dockerfile.test

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

0 commit comments

Comments
 (0)