Skip to content

Commit

Permalink
fix(passport): error loading shared library libexpat.so.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lijianguo committed Sep 22, 2021
1 parent c075190 commit 4f2a7f2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions rootfs/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 4f2a7f2

Please sign in to comment.