Public/extract_otp_secrets
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

sort docker imports

Browse Source
This commit is contained in:
scito
2023-01-02 13:53:29 +01:00
parent 77e23b4ae4
commit 1c106150b0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -15,8 +15,8 @@ COPY . .
ARG RUN_TESTS=true ARG RUN_TESTS=true
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libzbar0 \
libsm6 \ libsm6 \
libzbar0 \
python3-opencv \ python3-opencv \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& pip install --no-cache-dir -U -r \ && pip install --no-cache-dir -U -r \

14
Dockerfile_only_txt
View File

@@ -15,22 +15,22 @@ COPY . .
ARG RUN_TESTS=true ARG RUN_TESTS=true
RUN apk add --no-cache \ RUN apk add --no-cache \
zlib \
jpeg \ jpeg \
zlib \
&& echo "Arch: $(apk --print-arch)" \ && echo "Arch: $(apk --print-arch)" \
&& if [[ "$(apk --print-arch)" == "aarch64" ]]; then apk add --no-cache --virtual .build-deps \ && if [[ "$(apk --print-arch)" == "aarch64" ]]; then apk add --no-cache --virtual .build-deps \
gcc \ gcc \
libc-dev \
python3-dev \
py3-setuptools \
zlib-dev \
jpeg-dev \ jpeg-dev \
libc-dev \
py3-setuptools \
python3-dev \
zlib-dev \
; fi \ ; fi \
&& pip install --no-cache-dir -U \ && pip install --no-cache-dir -U \
colorama \
Pillow \
protobuf \ protobuf \
qrcode \ qrcode \
Pillow \
colorama \
&& if [[ "$(apk --print-arch)" == "aarch64" ]]; then apk del .build-deps; fi \ && if [[ "$(apk --print-arch)" == "aarch64" ]]; then apk del .build-deps; fi \
&& if [[ "$RUN_TESTS" == "true" ]]; then /extract/run_pytest.sh tests/extract_otp_secrets_test.py -k "not qreader" --relaxed; else echo "Not running tests..."; fi && if [[ "$RUN_TESTS" == "true" ]]; then /extract/run_pytest.sh tests/extract_otp_secrets_test.py -k "not qreader" --relaxed; else echo "Not running tests..."; fi