refactor image import and add Alpine docker image

- dynamic import of QR reader
- build docker also for arm64

Author: scito

.github/workflows/ci.yml

@@ -4,14 +4,14 @@ on:
   push:
   pull_request:
   schedule:
-    - cron: '47 3 * * *'
+    - cron: '37 3 * * *'
 
 jobs:
   build:
 
     strategy:
       matrix:
-        python-version: ["3.x", "3.11", "3.10", "3.9", "pypy-3.9", "3.8", "pypy-3.8", "3.7", "pypy-3.7"]
+        python-version: ["3.x", "3.11", "3.10", "3.9", "3.8", "3.7"]
         platform: [ubuntu-latest, macos-latest, windows-latest]
         exclude:
           - platform: windows-latest
@@ -25,6 +25,14 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Install zbar shared lib for QReader (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get install -y libzbar0
+      - name: Install zbar shared lib for QReader (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew install zbar
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.github/workflows/ci_docker.yml

@@ -0,0 +1,76 @@
+name: "Docker: build and publish"
+
+# How to setup: https://event-driven.io/en/how_to_buid_and_push_docker_image_with_github_actions/
+# How to run: https://aschmelyun.com/blog/using-docker-run-inside-of-github-actions/
+
+on:
+  # run it on push to the default repository branch
+  push:
+  #  branches: [master]
+  # run it during pull request
+  # pull_request:
+
+jobs:
+  # define job to build and publish docker image
+  build-and-push-docker-image:
+    name: Build Docker image and push to repositories
+    # run only when code is compiling and tests are passing
+    runs-on: ubuntu-latest
+
+    # steps to perform in job
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      # setup Docker build action
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to Github Packages
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GHCR_IO_TOKEN }}
+
+      - name: "no_qr_reader: Build image and push to Docker Hub and GitHub Container Registry"
+        uses: docker/build-push-action@v2
+        with:
+          # relative path to the place where source code with Dockerfile is located
+          platforms: linux/amd64,linux/arm64
+          context: .
+          file: Dockerfile_no_qr_reader
+          # Note: tags has to be all lower-case
+          tags: |
+            scit0/extract_otp_secret_keys_no_qr_reader:latest
+            ghcr.io/scito/extract_otp_secret_keys_no_qr_reader:latest
+          # build on feature branches, push only on master branch
+          # TODO push: ${{ github.ref == 'refs/heads/master' }}
+          push: true
+
+      - name: "qr_reader: Build image and push to Docker Hub and GitHub Container Registry"
+        uses: docker/build-push-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+          # relative path to the place where source code with Dockerfile is located
+          context: .
+          # Note: tags has to be all lower-case
+          tags: |
+            scit0/extract_otp_secret_keys:latest
+            ghcr.io/scito/extract_otp_secret_keys:latest
+          # build on feature branches, push only on master branch
+          # TODO push: ${{ github.ref == 'refs/heads/master' }}
+          push: true
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -1,11 +1,17 @@
-FROM python:3.11-alpine
+FROM python:3.11-slim-bullseye
 
 WORKDIR /extract
 
 COPY . .
 
-RUN pip install -r requirements.txt
+ARG run_tests=true
+
+RUN apt-get update && apt-get install -y libzbar0 python3-opencv nano \
+    && pip install -r requirements.txt \
+    && if [[ "$run_tests" == "true" ]] ; then /extract/run_pytest.sh ; else echo "Not running tests..." ; fi
 
 WORKDIR /files
 
-ENTRYPOINT [ "python", "/extract/extract_otp_secret_keys.py" ]
+ENTRYPOINT ["python", "/extract/extract_otp_secret_keys.py"]
+
+LABEL org.opencontainers.image.source https://github.com/scito/extract_otp_secret_keys

Dockerfile_no_qr_reader

@@ -0,0 +1,16 @@
+FROM python:3.11-alpine
+
+WORKDIR /extract
+
+COPY . .
+
+ARG run_tests=true
+
+RUN 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
+
+WORKDIR /files
+
+ENTRYPOINT ["python", "/extract/extract_otp_secret_keys.py"]
+
+LABEL org.opencontainers.image.source https://github.com/scito/extract_otp_secret_keys

Pipfile

@@ -4,15 +4,11 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-protobuf = "==4.21.12"
+protobuf = "*"
 qrcode = "*"
 pillow = "*"
-wheel = "==0.38.4"
-pytest = "==7.2.0"
-flake8 = "==6.0.0"
-pylint = "==2.15.9"
-qreader = "==1.3.1"
-opencv-python = "==4.6.0.66"
+qreader = "*"
+opencv-python = "*"
 
 [dev-packages]
 pytest = "*"