From 0eb5014eb095988624da6ff7e205af6cc8781fa4 Mon Sep 17 00:00:00 2001 From: scito Date: Thu, 29 Dec 2022 00:25:29 +0100 Subject: [PATCH] ci_docker: add docker/setup-buildx-action@v2 --- .github/workflows/ci_docker.yml | 3 +++ Dockerfile_no_qr_reader | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_docker.yml b/.github/workflows/ci_docker.yml index d59eee6..334e720 100644 --- a/.github/workflows/ci_docker.yml +++ b/.github/workflows/ci_docker.yml @@ -30,6 +30,9 @@ jobs: id: buildx uses: docker/setup-buildx-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub uses: docker/login-action@v2 with: diff --git a/Dockerfile_no_qr_reader b/Dockerfile_no_qr_reader index 6e32931..bf81522 100644 --- a/Dockerfile_no_qr_reader +++ b/Dockerfile_no_qr_reader @@ -5,9 +5,10 @@ WORKDIR /extract COPY . . ARG run_tests=true -ARG TARGETPLATFORM RUN apk add nano \ + && echo "TARGETARCH: $TARGETARCH" \ + && echo "BUILDARCH: $BUILDARCH" \ && if [[ "$TARGETARCH" == "arm64" ]]; then apk add zlib-dev jpeg-dev; fi \ && pip install protobuf qrcode Pillow \ && 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