Skip to content

Commit a3d5a54

Browse files
committed
fix(passport): error loading shared library libexpat.so.1
1 parent 2dc5f78 commit a3d5a54

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
@@ -22,10 +22,10 @@ RUN apk add --update --virtual .build-deps \
2222
&& python3 -m venv /app/.venv \
2323
&& source /app/.venv/bin/activate \
2424
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
25-
&& find /app/.venv/lib/ -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
25+
&& find /app/.venv /usr/local -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
2626
| tr ',' '\n' \
2727
| sort -u \
28-
| awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
28+
| awk 'system("[[ -e /app/.venv/lib/" $1 " || -e /usr/local/lib/" $1 " ]]") == 0 { next } { print "so:" $1 }' \
2929
| xargs -rt apk add --no-cache --virtual .python-rundeps \
3030
&& apk add --update --virtual .passport-rundeps \
3131
ca-certificates \

rootfs/Dockerfile.test

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

0 commit comments

Comments
 (0)