smokephil/extract_otp_secret_keys
1
0
Fork 0
mirror of https://github.com/scito/extract_otp_secret_keys.git synced 2025-12-06 14:54:57 +01:00
Code Issues Projects Releases Wiki Activity

mv docker extract_otp_secrets_no_qr_reader -> extract_otp_secrets_only_txt

Browse source
This commit is contained in:
scito 2022-12-30 20:43:51 +01:00
parent 549c128fb7
commit 97e4f084cb
5 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/ci_docker.yml vendored
View file

@ -44,18 +44,18 @@ jobs:
password: ${{ secrets.GHCR_IO_TOKEN }} password: ${{ secrets.GHCR_IO_TOKEN }}
- name: "no_qr_reader: Build image and push to Docker Hub and GitHub Container Registry" - 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 uses: docker/build-push-action@v2
with: with:
# relative path to the place where source code with Dockerfile is located # relative path to the place where source code with Dockerfile is located
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
context: . context: .
file: Dockerfile_no_qr_reader file: Dockerfile_only_txt
# builder: ${{ steps.buildx.outputs.name }} # builder: ${{ steps.buildx.outputs.name }}
# Note: tags has to be all lower-case # Note: tags has to be all lower-case
tags: | tags: |
scit0/extract_otp_secrets_no_qr_reader:latest scit0/extract_otp_secrets_only_txt:latest
ghcr.io/scito/extract_otp_secrets_no_qr_reader:latest ghcr.io/scito/extract_otp_secrets_only_txt:latest
scit0/extract_otp_secrets:latest-no-qreader scit0/extract_otp_secrets:latest-no-qreader
ghcr.io/scito/extract_otp_secrets:latest-no-qreader ghcr.io/scito/extract_otp_secrets:latest-no-qreader
# build on feature branches, push only on master branch # build on feature branches, push only on master branch
@ -83,4 +83,4 @@ jobs:
- name: Image digest - name: Image digest
run: | run: |
echo "extract_otp_secrets: ${{ steps.docker_build_qr_reader.outputs.digest }}" 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 }}"

2
.gitignore vendored
View file

@ -15,7 +15,7 @@ venv/
*.whl *.whl
build/ build/
dist/ dist/
extract_otp_secret_keys.egg-info/ *.egg-info/
*.xml *.xml
pytest-coverage.txt pytest-coverage.txt
tests/reports/ tests/reports/

6
Dockerfile_no_qr_reader → Dockerfile_only_txt
View file

@ -1,9 +1,9 @@
FROM python:3.11-alpine FROM python:3.11-alpine
# For debugging # For debugging
# docker build . -t extract_otp_secrets_no_qr_reader -f Dockerfile_no_qr_reader --pull --build-arg RUN_TESTS=false # 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_no_qr_reader # 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_no_qr_reader extract_otp_secrets_test.py -k "not qreader" --relaxed # 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 WORKDIR /extract

16
README.md
View file

@ -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 run --pull always --rm -v "$(pwd)":/files:ro -i scit0/extract_otp_secrets
docker login -uscit0 docker login -uscit0
docker build . -t extract_otp_secrets_no_qr_reader -f Dockerfile_no_qr_reader --pull docker build . -t extract_otp_secrets_only_txt -f Dockerfile_only_txt --pull
docker build . -t extract_otp_secrets_no_qr_reader -f Dockerfile_no_qr_reader --pull --build-arg RUN_TESTS=false 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_no_qr_reader extract_otp_secrets_test.py -k "not qreader" --relaxed 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_no_qr_reader example_export.txt 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_no_qr_reader - < 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_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 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
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
docker pull ghcr.io/scito/extract_otp_secrets_no_qr_reader docker pull ghcr.io/scito/extract_otp_secrets_only_txt
## Tests ## Tests

8
upgrade_deps.sh
View file

@ -292,19 +292,19 @@ TOTAL_COVERAGE=$(cat $COVERAGE_OUT | grep 'TOTAL' | perl -ne 'print "$&" if /\b(
# Build docker # 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 if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
eval "$cmd" 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 if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
eval "$cmd" 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 if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
eval "$cmd" 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 if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
eval "$cmd" eval "$cmd"