From 1c106150b0c3fbaa729ba1b7f36be71927301dd3 Mon Sep 17 00:00:00 2001 From: scito Date: Mon, 2 Jan 2023 13:53:29 +0100 Subject: [PATCH] sort docker imports --- Dockerfile | 2 +- Dockerfile_only_txt | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7baaf09..89acc6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,8 @@ COPY . . ARG RUN_TESTS=true RUN apt-get update && apt-get install -y \ - libzbar0 \ libsm6 \ + libzbar0 \ python3-opencv \ && rm -rf /var/lib/apt/lists/* \ && pip install --no-cache-dir -U -r \ diff --git a/Dockerfile_only_txt b/Dockerfile_only_txt index 46b579f..0ff5f91 100644 --- a/Dockerfile_only_txt +++ b/Dockerfile_only_txt @@ -15,22 +15,22 @@ COPY . . ARG RUN_TESTS=true RUN apk add --no-cache \ - zlib \ jpeg \ + zlib \ && echo "Arch: $(apk --print-arch)" \ && if [[ "$(apk --print-arch)" == "aarch64" ]]; then apk add --no-cache --virtual .build-deps \ gcc \ - libc-dev \ - python3-dev \ - py3-setuptools \ - zlib-dev \ jpeg-dev \ + libc-dev \ + py3-setuptools \ + python3-dev \ + zlib-dev \ ; fi \ && pip install --no-cache-dir -U \ + colorama \ + Pillow \ protobuf \ qrcode \ - Pillow \ - colorama \ && 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