From b4931856bae4adba4541e3fa882a534ae808f1d8 Mon Sep 17 00:00:00 2001 From: scito Date: Thu, 29 Dec 2022 02:34:29 +0100 Subject: [PATCH] apk add --no-cache nano zlib jpeg && re-enable tests --- .github/workflows/ci_docker.yml | 2 +- Dockerfile_no_qr_reader | 2 +- README.md | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_docker.yml b/.github/workflows/ci_docker.yml index 666f62e..97bb77f 100644 --- a/.github/workflows/ci_docker.yml +++ b/.github/workflows/ci_docker.yml @@ -59,7 +59,7 @@ jobs: # TODO push: ${{ github.ref == 'refs/heads/master' }} push: true build-args: | - RUN_TESTS=false + RUN_TESTS=true - name: "qr_reader: Build image and push to Docker Hub and GitHub Container Registry" uses: docker/build-push-action@v2 diff --git a/Dockerfile_no_qr_reader b/Dockerfile_no_qr_reader index cb6858e..d7f737e 100644 --- a/Dockerfile_no_qr_reader +++ b/Dockerfile_no_qr_reader @@ -6,7 +6,7 @@ COPY . . ARG RUN_TESTS=true -RUN apk add --no-cache nano \ +RUN apk add --no-cache nano zlib jpeg \ && 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; fi \ && pip install protobuf qrcode Pillow \ diff --git a/README.md b/README.md index c76545d..e32ebbe 100644 --- a/README.md +++ b/README.md @@ -336,8 +336,10 @@ docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extrac docker login -uscit0 docker build . -t extract_otp_secret_keys_no_qr_reader -f Dockerfile_no_qr_reader --pull docker build . -t extract_otp_secret_keys_no_qr_reader -f Dockerfile_no_qr_reader --pull --build-arg RUN_TESTS=false +docker run --entrypoint /bin/sh -it --rm -v "$(pwd)":/files:ro extract_otp_secret_keys_no_qr_reader docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extract_otp_secret_keys_no_qr_reader -docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extract_otp_secret_keys_no_qr_reader test_extract_otp_secret_keys_pytest.py -k "not qreader" +docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extract_otp_secret_keys_no_qr_reader test_extract_otp_secret_keys_pytest.py -k "not qreader" --relaxed +docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro scit0/extract_otp_secret_keys_no_qr_reader test_extract_otp_secret_keys_pytest.py -k "not qreader" --relaxed docker run --rm -v "$(pwd)":/files:ro extract_otp_secret_keys_no_qr_reader example_export.txt docker run --rm -v "$(pwd)":/files:ro -i extract_otp_secret_keys_no_qr_reader - < example_export.txt docker build . -t extract_otp_secret_keys_no_qr_reader -f Dockerfile_no_qr_reader --pull && docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extract_otp_secret_keys_no_qr_reader test_extract_otp_secret_keys_pytest.py -k "not qreader" -vvv --relaxed -s