diff --git a/Dockerfile b/Dockerfile index 7ba036c..5c2403e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,11 @@ WORKDIR /extract COPY . . +ARG run_tests=true + RUN apt-get update && apt-get install -y libzbar0 python3-opencv nano \ && pip install -r requirements.txt \ - && /extract/run_pytest.sh + && if [[ "$run_tests" == "true" ]] ; then /extract/run_pytest.sh ; else echo "Not running tests..." ; fi WORKDIR /files diff --git a/Dockerfile_no_qr_reader b/Dockerfile_no_qr_reader index 5d61ff5..9ca838a 100644 --- a/Dockerfile_no_qr_reader +++ b/Dockerfile_no_qr_reader @@ -4,8 +4,10 @@ WORKDIR /extract COPY . . +ARG run_tests=true + RUN pip install protobuf qrcode Pillow \ - && /extract/run_pytest.sh test_extract_otp_secret_keys_pytest.py -k "not qreader" --relaxed + && if [[ "$run_tests" == "true" ]] ; then /extract/run_pytest.sh test_extract_otp_secret_keys_pytest.py -k "not qreader" --relaxed ; else echo "Not running tests..." ; fi WORKDIR /files diff --git a/README.md b/README.md index 9aadb52..d5deba5 100644 --- a/README.md +++ b/README.md @@ -319,6 +319,7 @@ docker run --entrypoint /bin/bash -it --rm -v "$(pwd)":/files:ro extract_otp_sec docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extract_otp_secret_keys 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 /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 --rm -v "$(pwd)":/files:ro extract_otp_secret_keys_no_qr_reader example_export.txt