From 59bb14c083bd8dcb4d31510509fea6481f97da30 Mon Sep 17 00:00:00 2001
From: Luc Pierson <luc.pierson@sdbinfo.fr>
Date: Sun, 5 Apr 2026 13:24:51 +0200
Subject: [PATCH] chgt build odoo

---
 2.build.postgresql.sh                         |  2 +-
 3.build.odoo.sh                               | 47 ++++++++++++++++++-
 Dockerfile => config-odoo/Dockerfile          |  0
 entrypoint.sh => config-odoo/entrypoint.sh    |  0
 config-odoo/requirements.txt                  | 15 ++++++
 .../wait-for-psql.py                          |  0
 .../Dockerfile                                |  0
 7 files changed, 62 insertions(+), 2 deletions(-)
 rename Dockerfile => config-odoo/Dockerfile (100%)
 rename entrypoint.sh => config-odoo/entrypoint.sh (100%)
 create mode 100644 config-odoo/requirements.txt
 rename wait-for-psql.py => config-odoo/wait-for-psql.py (100%)
 rename {postgresql-config => config-postgresql}/Dockerfile (100%)

diff --git a/2.build.postgresql.sh b/2.build.postgresql.sh
index 2581ba0..e041495 100755
--- a/2.build.postgresql.sh
+++ b/2.build.postgresql.sh
@@ -1,6 +1,6 @@
 #cd postgresql-config
 #docker build -t postgres15-5434-image .
 docker build \
-  -f ./postgresql-config/Dockerfile \
+  -f ./config-postgresql/Dockerfile \
   -t postgres15-5434-image .
 #cd ..
diff --git a/3.build.odoo.sh b/3.build.odoo.sh
index c76e66d..ebf224a 100755
--- a/3.build.odoo.sh
+++ b/3.build.odoo.sh
@@ -1 +1,46 @@
-docker build -t odoo18-20260324-image .
+#!/usr/bin/env bash
+set -euo pipefail
+
+# ── Extraction des métadonnées depuis le Dockerfile ──────────────────────────
+DOCKERFILE=./config-odoo/"${1:-Dockerfile}"
+
+ODOO_VERSION=$(grep -E '^\s*ENV ODOO_VERSION\s' "$DOCKERFILE" | awk '{print $3}')
+ODOO_RELEASE=$(grep -E '^\s*ARG ODOO_RELEASE=' "$DOCKERFILE" | cut -d'=' -f2)
+
+if [[ -z "$ODOO_VERSION" || -z "$ODOO_RELEASE" ]]; then
+  echo "ERREUR : impossible d'extraire ODOO_VERSION ou ODOO_RELEASE depuis $DOCKERFILE" >&2
+  exit 1
+fi
+
+IMAGE_NAME="odoo-${ODOO_VERSION}.${ODOO_RELEASE}-image"
+
+echo "────────────────────────────────────────────"
+echo "  Dockerfile   : $DOCKERFILE"
+echo "  Odoo version : $ODOO_VERSION"
+echo "  Build release: $ODOO_RELEASE"
+echo "  Image cible  : $IMAGE_NAME"
+echo "────────────────────────────────────────────"
+
+# ── Build ─────────────────────────────────────────────────────────────────────
+
+#echo "──commande cp───────────────────────────────"
+cp ./odoo.conf ./config-odoo/
+cp ./requirements.txt ./config-odoo/
+
+#echo "──commande cd ──────────────────────────────"
+cd config-odoo
+
+#echo "───commande build ──────────────────────────"
+docker build \
+  --build-arg ODOO_RELEASE="$ODOO_RELEASE" \
+  --tag "$IMAGE_NAME" \
+  .
+
+#echo "─commande cd ..─────────────────────────────"
+cd ..
+
+
+#echo "──────fin───────────────────────────────────"
+
+echo ""
+echo "✓ Image construite : $IMAGE_NAME"
diff --git a/Dockerfile b/config-odoo/Dockerfile
similarity index 100%
rename from Dockerfile
rename to config-odoo/Dockerfile
diff --git a/entrypoint.sh b/config-odoo/entrypoint.sh
similarity index 100%
rename from entrypoint.sh
rename to config-odoo/entrypoint.sh
diff --git a/config-odoo/requirements.txt b/config-odoo/requirements.txt
new file mode 100644
index 0000000..8a1b6ef
--- /dev/null
+++ b/config-odoo/requirements.txt
@@ -0,0 +1,15 @@
+packaging
+regex
+dateparser
+pymupdf
+factur-x
+lxml
+num2words
+pyfrdas2>=0.10
+pypdf>=3.1.0
+python-dateutil
+python-stdnum
+requests
+requests_oauthlib
+unidecode
+
diff --git a/wait-for-psql.py b/config-odoo/wait-for-psql.py
similarity index 100%
rename from wait-for-psql.py
rename to config-odoo/wait-for-psql.py
diff --git a/postgresql-config/Dockerfile b/config-postgresql/Dockerfile
similarity index 100%
rename from postgresql-config/Dockerfile
rename to config-postgresql/Dockerfile