From 97e4f084cb811dc4b076a9a4fedab1764da64e1b Mon Sep 17 00:00:00 2001
From: scito <info@scito.ch>
Date: Fri, 30 Dec 2022 20:43:51 +0100
Subject: [PATCH] mv docker extract_otp_secrets_no_qr_reader ->
 extract_otp_secrets_only_txt

---
 .github/workflows/ci_docker.yml                | 10 +++++-----
 .gitignore                                     |  2 +-
 Dockerfile_no_qr_reader => Dockerfile_only_txt |  6 +++---
 README.md                                      | 16 ++++++++--------
 upgrade_deps.sh                                |  8 ++++----
 5 files changed, 21 insertions(+), 21 deletions(-)
 rename Dockerfile_no_qr_reader => Dockerfile_only_txt (78%)

diff --git a/.github/workflows/ci_docker.yml b/.github/workflows/ci_docker.yml
index b4d1bea..7481e47 100644
--- a/.github/workflows/ci_docker.yml
+++ b/.github/workflows/ci_docker.yml
@@ -44,18 +44,18 @@ jobs:
           password: ${{ secrets.GHCR_IO_TOKEN }}
 
       - name: "no_qr_reader: Build image and push to Docker Hub and GitHub Container Registry"
-        id: docker_build_no_qr_reader
+        id: docker_build_only_txt
         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
+          file: Dockerfile_only_txt
           # builder: ${{ steps.buildx.outputs.name }}
           # Note: tags has to be all lower-case
           tags: |
-            scit0/extract_otp_secrets_no_qr_reader:latest
-            ghcr.io/scito/extract_otp_secrets_no_qr_reader:latest
+            scit0/extract_otp_secrets_only_txt:latest
+            ghcr.io/scito/extract_otp_secrets_only_txt:latest
             scit0/extract_otp_secrets:latest-no-qreader
             ghcr.io/scito/extract_otp_secrets:latest-no-qreader
           # build on feature branches, push only on master branch
@@ -83,4 +83,4 @@ jobs:
       - name: Image digest
         run: |
           echo "extract_otp_secrets: ${{ steps.docker_build_qr_reader.outputs.digest }}"
-          echo "extract_otp_secrets_no_qr_reader: ${{ steps.docker_build_no_qr_reader.outputs.digest }}"
+          echo "extract_otp_secrets_only_txt: ${{ steps.docker_build_only_txt.outputs.digest }}"
diff --git a/.gitignore b/.gitignore
index cb80958..19ff843 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ venv/
 *.whl
 build/
 dist/
-extract_otp_secret_keys.egg-info/
+*.egg-info/
 *.xml
 pytest-coverage.txt
 tests/reports/
diff --git a/Dockerfile_no_qr_reader b/Dockerfile_only_txt
similarity index 78%
rename from Dockerfile_no_qr_reader
rename to Dockerfile_only_txt
index 9e05ed0..fa92566 100644
--- a/Dockerfile_no_qr_reader
+++ b/Dockerfile_only_txt
@@ -1,9 +1,9 @@
 FROM python:3.11-alpine
 
 # For debugging
-# docker build . -t extract_otp_secrets_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_secrets_no_qr_reader
-# docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extract_otp_secrets_no_qr_reader extract_otp_secrets_test.py -k "not qreader" --relaxed
+# docker build . -t extract_otp_secrets_only_txt -f Dockerfile_only_txt --pull --build-arg RUN_TESTS=false
+# docker run --entrypoint /bin/sh -it --rm -v "$(pwd)":/files:ro extract_otp_secrets_only_txt
+# docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extract_otp_secrets_only_txt extract_otp_secrets_test.py -k "not qreader" --relaxed
 
 WORKDIR /extract
 
diff --git a/README.md b/README.md
index 22a9dfa..f555918 100644
--- a/README.md
+++ b/README.md
@@ -365,18 +365,18 @@ docker run --entrypoint /bin/bash -it --rm -v "$(pwd)":/files:ro extract_otp_sec
 docker run --pull always --rm -v "$(pwd)":/files:ro -i scit0/extract_otp_secrets
 
 docker login -uscit0
-docker build . -t extract_otp_secrets_no_qr_reader -f Dockerfile_no_qr_reader --pull
-docker build . -t extract_otp_secrets_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 scit0/extract_otp_secrets_no_qr_reader extract_otp_secrets_test.py -k "not qreader" --relaxed
-docker run --rm -v "$(pwd)":/files:ro extract_otp_secrets_no_qr_reader example_export.txt
-docker run --rm -v "$(pwd)":/files:ro -i extract_otp_secrets_no_qr_reader - < example_export.txt
-docker build . -t extract_otp_secrets_no_qr_reader -f Dockerfile_no_qr_reader --pull && docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extract_otp_secrets_no_qr_reader extract_otp_secrets_test.py -k "not qreader" -vvv --relaxed -s
+docker build . -t extract_otp_secrets_only_txt -f Dockerfile_only_txt --pull
+docker build . -t extract_otp_secrets_only_txt -f Dockerfile_only_txt --pull --build-arg RUN_TESTS=false
+docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro scit0/extract_otp_secrets_only_txt extract_otp_secrets_test.py -k "not qreader" --relaxed
+docker run --rm -v "$(pwd)":/files:ro extract_otp_secrets_only_txt example_export.txt
+docker run --rm -v "$(pwd)":/files:ro -i extract_otp_secrets_only_txt - < example_export.txt
+docker build . -t extract_otp_secrets_only_txt -f Dockerfile_only_txt --pull && docker run --entrypoint /extract/run_pytest.sh --rm -v "$(pwd)":/files:ro extract_otp_secrets_only_txt extract_otp_secrets_test.py -k "not qreader" -vvv --relaxed -s
 
 docker pull scit0/extract_otp_secrets
-docker pull scit0/extract_otp_secrets_no_qr_reader
+docker pull scit0/extract_otp_secrets_only_txt
 
 docker pull ghcr.io/scito/extract_otp_secrets
-docker pull ghcr.io/scito/extract_otp_secrets_no_qr_reader
+docker pull ghcr.io/scito/extract_otp_secrets_only_txt
 
 ## Tests
 
diff --git a/upgrade_deps.sh b/upgrade_deps.sh
index 7df198b..9b370d5 100755
--- a/upgrade_deps.sh
+++ b/upgrade_deps.sh
@@ -292,19 +292,19 @@ TOTAL_COVERAGE=$(cat $COVERAGE_OUT | grep 'TOTAL' | perl -ne 'print "$&" if /\b(
 
 # Build docker
 
-cmd="docker build . -t extract_otp_secrets_no_qr_reader -f Dockerfile_no_qr_reader --pull"
+cmd="docker build . -t extract_otp_secrets_only_txt -f Dockerfile_only_txt --pull"
 if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
 eval "$cmd"
 
-cmd="docker run --rm -v \"$(pwd)\":/files:ro extract_otp_secrets_no_qr_reader example_export.txt"
+cmd="docker run --rm -v \"$(pwd)\":/files:ro extract_otp_secrets_only_txt example_export.txt"
 if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
 eval "$cmd"
 
-cmd="docker run --rm -i -v \"$(pwd)\":/files:ro extract_otp_secrets_no_qr_reader - < example_export.txt"
+cmd="docker run --rm -i -v \"$(pwd)\":/files:ro extract_otp_secrets_only_txt - < example_export.txt"
 if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
 eval "$cmd"
 
-cmd="docker run --entrypoint /extract/run_pytest.sh --rm -v \"$(pwd)\":/files:ro extract_otp_secrets_no_qr_reader tests/extract_otp_secrets_test.py -k 'not qreader' -vvv --relaxed"
+cmd="docker run --entrypoint /extract/run_pytest.sh --rm -v \"$(pwd)\":/files:ro extract_otp_secrets_only_txt tests/extract_otp_secrets_test.py -k 'not qreader' -vvv --relaxed"
 if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
 eval "$cmd"