From 0e0318411586974eb76280b959ec474ce63ae957 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Wed, 19 Jul 2023 18:23:08 +0200
Subject: [PATCH] Add a Debian Bookworm (12)

---
 Dockerfile          |  4 ----
 Dockerfile.common   |  5 +++++
 Dockerfile.debian11 |  7 +++++++
 Dockerfile.debian12 |  7 +++++++
 README.md           | 22 ++++++++++++++++++++++
 5 files changed, 41 insertions(+), 4 deletions(-)
 delete mode 100644 Dockerfile
 create mode 100644 Dockerfile.common
 create mode 100644 Dockerfile.debian11
 create mode 100644 Dockerfile.debian12

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index b336ddb..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM debian:latest
-RUN apt-get update && apt-get install --no-install-recommends -y python3-all python3-dev python3-pip python3-venv python3-apt apt-file dpkg-dev fakeroot build-essential devscripts debhelper dh-python python3-wheel sed lsb-release gnupg2 curl jq git python3-git rsync && apt-get clean && rm -rf /var/lib/apt/lists/* && apt-file update
-RUN python3 -m pip install wheel2deb pylint pytest flake8 flake8-junit-report pylint-junit junitparser
-RUN git clone https://gitea.zionetrix.net/bn8/gitdch.git /usr/local/src/gitdch && ln -s /usr/local/src/gitdch/gitdch /usr/local/bin/gitdch
diff --git a/Dockerfile.common b/Dockerfile.common
new file mode 100644
index 0000000..ba10ae7
--- /dev/null
+++ b/Dockerfile.common
@@ -0,0 +1,5 @@
+ENV APT_PACKAGES="python3-all python3-dev python3-pip python3-venv python3-apt apt-file dpkg-dev fakeroot build-essential devscripts debhelper dh-python python3-wheel sed lsb-release gnupg2 curl jq git python3-git rsync"
+ENV PIP_PACKAGES="wheel2deb pylint pytest flake8 flake8-junit-report pylint-junit junitparser"
+
+RUN apt-get update && apt-get install --no-install-recommends -y $APT_PACKAGES && apt-get clean && rm -rf /var/lib/apt/lists/* && apt-file update
+RUN git clone https://gitea.zionetrix.net/bn8/gitdch.git /usr/local/src/gitdch && ln -s /usr/local/src/gitdch/gitdch /usr/local/bin/gitdch
diff --git a/Dockerfile.debian11 b/Dockerfile.debian11
new file mode 100644
index 0000000..c9a9364
--- /dev/null
+++ b/Dockerfile.debian11
@@ -0,0 +1,7 @@
+# syntax = edrevo/dockerfile-plus
+
+FROM debian:11
+
+INCLUDE+ Dockerfile.common
+
+RUN python3 -m pip install $PIP_PACKAGES
diff --git a/Dockerfile.debian12 b/Dockerfile.debian12
new file mode 100644
index 0000000..9f1c066
--- /dev/null
+++ b/Dockerfile.debian12
@@ -0,0 +1,7 @@
+# syntax = edrevo/dockerfile-plus
+
+FROM debian:12
+
+INCLUDE+ Dockerfile.common
+
+RUN python3 -m pip install --break-system-packages $PIP_PACKAGES
diff --git a/README.md b/README.md
index 3004fcc..b286f49 100644
--- a/README.md
+++ b/README.md
@@ -13,3 +13,25 @@ To use it:
 ```bash
 docker run -it -v "$(pwd)":/src -w /src brenard/debian-python-deb
 ```
+
+## Build
+
+```bash
+# Need to use Dockerfile+ (https://github.com/edrevo/dockerfile-plus)
+export DOCKER_BUILDKIT=1
+export COMPOSE_DOCKER_CLI_BUILD=1
+
+for deb_version in 11 12
+do
+    docker build -t brenard/debian-python-deb:debian${deb_version} -f Dockerfile.debian${deb_version} .
+done
+```
+
+## Publish
+
+```bash
+for deb_version in 11 12
+do
+    docker push brenard/debian-python-deb:debian${deb_version}
+done
+```