set Docker base image to Python 3.13; fix README

This commit is contained in:
scito 2024-10-25 21:14:11 +02:00 committed by Roland Kurmann
parent 6503b442f1
commit 396071f15a
4 changed files with 14 additions and 9 deletions

View file

@ -36,6 +36,9 @@ The secrets can be exported to JSON or CSV, or printed as QR codes to console or
## Table of contents ## Table of contents
## Table of contents
- [Table of contents](#table-of-contents)
- [Download and run binary executable (🆕 since v2.1)](#download-and-run-binary-executable--since-v21) - [Download and run binary executable (🆕 since v2.1)](#download-and-run-binary-executable--since-v21)
- [MacOS](#macos) - [MacOS](#macos)
- [Usage](#usage) - [Usage](#usage)
@ -46,7 +49,7 @@ The secrets can be exported to JSON or CSV, or printed as QR codes to console or
- [Installation of optional shared system libraries (recommended)](#installation-of-optional-shared-system-libraries-recommended) - [Installation of optional shared system libraries (recommended)](#installation-of-optional-shared-system-libraries-recommended)
- [Program help: arguments and options](#program-help-arguments-and-options) - [Program help: arguments and options](#program-help-arguments-and-options)
- [Examples](#examples) - [Examples](#examples)
- [Printing otp secrets from text file](#printing-otp-secrets-form-text-file) - [Printing otp secrets from text file](#printing-otp-secrets-from-text-file)
- [Printing otp secrets from image file](#printing-otp-secrets-from-image-file) - [Printing otp secrets from image file](#printing-otp-secrets-from-image-file)
- [Writing otp secrets to csv file](#writing-otp-secrets-to-csv-file) - [Writing otp secrets to csv file](#writing-otp-secrets-to-csv-file)
- [Writing otp secrets to json file](#writing-otp-secrets-to-json-file) - [Writing otp secrets to json file](#writing-otp-secrets-to-json-file)
@ -66,7 +69,8 @@ The secrets can be exported to JSON or CSV, or printed as QR codes to console or
- [pipenv](#pipenv) - [pipenv](#pipenv)
- [Visual Studio Code Remote - Containers / VSCode devcontainer](#visual-studio-code-remote---containers--vscode-devcontainer) - [Visual Studio Code Remote - Containers / VSCode devcontainer](#visual-studio-code-remote---containers--vscode-devcontainer)
- [venv](#venv) - [venv](#venv)
- [devbox](#devbox) - [devbox 1](#devbox-1)
- [devbox 2](#devbox-2)
- [docker](#docker) - [docker](#docker)
- [More docker examples](#more-docker-examples) - [More docker examples](#more-docker-examples)
- [Tests](#tests) - [Tests](#tests)
@ -280,7 +284,7 @@ python extract_otp_secrets.py = < example_export.png</pre>
## Examples ## Examples
### Printing otp secrets form text file ### Printing otp secrets from text file
python src/extract_otp_secrets.py example_export.txt python src/extract_otp_secrets.py example_export.txt
@ -517,7 +521,7 @@ Alternatively, you can use a python virtual env for the dependencies:
The requirements\*.txt files contain all the dependencies (also the optional ones). The requirements\*.txt files contain all the dependencies (also the optional ones).
To leave the python virtual env just call `deactivate`. To leave the python virtual env just call `deactivate`.
### devbox ### devbox 1
Install [devbox](https://github.com/jetpack-io/devbox), which is a wrapper for nix. Then enter the environment with Python and the packages installed with: Install [devbox](https://github.com/jetpack-io/devbox), which is a wrapper for nix. Then enter the environment with Python and the packages installed with:
@ -525,7 +529,7 @@ Install [devbox](https://github.com/jetpack-io/devbox), which is a wrapper for n
devbox shell devbox shell
``` ```
### devbox ### devbox 2
Install [devbox](https://devenv.sh), which is a wrapper for nix. Then enter the environment with Python and the packages installed with: Install [devbox](https://devenv.sh), which is a wrapper for nix. Then enter the environment with Python and the packages installed with:

View file

@ -1,5 +1,5 @@
# --build-arg BASE_IMAGE=python:3.11-slim-buster # --build-arg BASE_IMAGE=python:3.11-slim-buster
ARG BASE_IMAGE=python:3.12-slim-bookworm ARG BASE_IMAGE=python:3.13-slim-bookworm
FROM $BASE_IMAGE FROM $BASE_IMAGE
# https://docs.docker.com/engine/reference/builder/ # https://docs.docker.com/engine/reference/builder/

View file

@ -1,4 +1,4 @@
ARG BASE_IMAGE=python:3.12-alpine ARG BASE_IMAGE=python:3.13-alpine
FROM $BASE_IMAGE FROM $BASE_IMAGE
# https://docs.docker.com/engine/reference/builder/ # https://docs.docker.com/engine/reference/builder/

View file

@ -13,7 +13,7 @@ Generate from file: README.md
- [Installation of optional shared system libraries (recommended)](#installation-of-optional-shared-system-libraries-recommended) - [Installation of optional shared system libraries (recommended)](#installation-of-optional-shared-system-libraries-recommended)
- [Program help: arguments and options](#program-help-arguments-and-options) - [Program help: arguments and options](#program-help-arguments-and-options)
- [Examples](#examples) - [Examples](#examples)
- [Printing otp secrets form text file](#printing-otp-secrets-form-text-file) - [Printing otp secrets from text file](#printing-otp-secrets-from-text-file)
- [Printing otp secrets from image file](#printing-otp-secrets-from-image-file) - [Printing otp secrets from image file](#printing-otp-secrets-from-image-file)
- [Writing otp secrets to csv file](#writing-otp-secrets-to-csv-file) - [Writing otp secrets to csv file](#writing-otp-secrets-to-csv-file)
- [Writing otp secrets to json file](#writing-otp-secrets-to-json-file) - [Writing otp secrets to json file](#writing-otp-secrets-to-json-file)
@ -33,7 +33,8 @@ Generate from file: README.md
- [pipenv](#pipenv) - [pipenv](#pipenv)
- [Visual Studio Code Remote - Containers / VSCode devcontainer](#visual-studio-code-remote---containers--vscode-devcontainer) - [Visual Studio Code Remote - Containers / VSCode devcontainer](#visual-studio-code-remote---containers--vscode-devcontainer)
- [venv](#venv) - [venv](#venv)
- [devbox](#devbox) - [devbox 1](#devbox-1)
- [devbox 2](#devbox-2)
- [docker](#docker) - [docker](#docker)
- [More docker examples](#more-docker-examples) - [More docker examples](#more-docker-examples)
- [Tests](#tests) - [Tests](#tests)