diff --git a/.github/workflows/ci_docker.yml b/.github/workflows/ci_docker.yml index 334e720..76e4c3a 100644 --- a/.github/workflows/ci_docker.yml +++ b/.github/workflows/ci_docker.yml @@ -26,10 +26,6 @@ jobs: uses: docker/setup-qemu-action@v2 # setup Docker build action - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/Dockerfile_no_qr_reader b/Dockerfile_no_qr_reader index 4fb9504..c6221f8 100644 --- a/Dockerfile_no_qr_reader +++ b/Dockerfile_no_qr_reader @@ -8,10 +8,10 @@ ARG run_tests=true RUN apk add --no-cache nano \ && echo "Arch: $(apk --print-arch)" \ - && if [[ "$(apk --print-arch)" == "aarch64" ]]; then apk add --no-cache --virtual .build-deps gcc musl-dev python3-dev py3-setuptools zlib-dev jpeg-dev; fi \ + && 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 \ && if [[ "$(apk --print-arch)" == "aarch64" ]]; then apk del .build-deps; fi \ - && 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 + && if [[ "$run_tests" == "true" ]]; then /extract/run_pytest.sh test_extract_otp_secret_keys_pytest.py -k "not qreader" --relaxed --build-arg run_tests=false; else echo "Not running tests..."; fi # && if [[ "$TARGETARCH" == "arm64" ]]; then apk add zlib-dev jpeg-dev; fi \