Skip to content

Commit 3ccb1fa

Browse files
committed
chore(passport): exclude cryptography
1 parent d4ab5dd commit 3ccb1fa

2 files changed

Lines changed: 10 additions & 14 deletions

File tree

rootfs/Dockerfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ 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-
&& runDeps="$( \
26-
scanelf --needed --nobanner --format '%n#p' --recursive /app/.venv \
27-
| tr ',' '\n' \
28-
| sort -u \
29-
| awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
30-
)" \
25+
&& find /app/.venv/lib/ -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
26+
| tr ',' '\n' \
27+
| sort -u \
28+
| awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
29+
| xargs -rt apk add --no-cache --virtual .python-rundeps \
3130
&& apk add --update --virtual .passport-rundeps \
32-
$runDeps \
3331
ca-certificates \
3432
su-exec \
3533
bash \

rootfs/Dockerfile.test

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/main >>/etc/apk/repositories
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-
&& runDeps="$( \
25-
scanelf --needed --nobanner --format '%n#p' --recursive /app/.venv \
26-
| tr ',' '\n' \
27-
| sort -u \
28-
| awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
29-
)" \
24+
&& find /app/.venv/lib/ -type f -executable ! -path '*/cryptography*' -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
25+
| tr ',' '\n' \
26+
| sort -u \
27+
| awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
28+
| xargs -rt apk add --no-cache --virtual .python-rundeps \
3029
&& apk add --update --virtual .passport-rundeps \
31-
$runDeps \
3230
gcc \
3331
git \
3432
mercurial \

0 commit comments

Comments
 (0)