From 79ba82f8eec050dfcd75ef464e75875ba4765fa8 Mon Sep 17 00:00:00 2001
From: Florian Rey <nervo@nervo.net>
Date: Mon, 29 May 2023 09:40:55 +0200
Subject: [PATCH] [Elao - App - Docker] Debian 12

---
 elao.app.docker/.manala.yaml                        |  2 +-
 .../.manala/ansible/collections/requirements.yaml   |  8 ++++++--
 elao.app.docker/.manala/docker/Dockerfile.tmpl      | 13 ++++++++++---
 elao.app.docker/README.md                           |  2 +-
 elao.app.docker/test/.manala.yaml                   |  2 +-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/elao.app.docker/.manala.yaml b/elao.app.docker/.manala.yaml
index 5900fea5..090c7dd7 100644
--- a/elao.app.docker/.manala.yaml
+++ b/elao.app.docker/.manala.yaml
@@ -32,7 +32,7 @@ project:
 
 system:
     # @option {"label": "System version"}
-    # @schema {"enum": [11, 10]}
+    # @schema {"enum": [12, 11, 10]}
     version: ~
     # @schema {"type": "string", "pattern": "^[a-zA-Z]+/[a-zA-Z]+$"}
     timezone: Etc/UTC
diff --git a/elao.app.docker/.manala/ansible/collections/requirements.yaml b/elao.app.docker/.manala/ansible/collections/requirements.yaml
index bd2d5c6a..59982f19 100644
--- a/elao.app.docker/.manala/ansible/collections/requirements.yaml
+++ b/elao.app.docker/.manala/ansible/collections/requirements.yaml
@@ -2,10 +2,14 @@
 
 collections:
   - ansible.posix
+  - community.crypto
   - community.docker
   - community.general
   - community.mongodb
   - community.mysql
   - gluster.gluster
-  - manala.roles
-  - community.crypto
+  # !!! Not Ready !!!
+  #- manala.roles
+  - name: https://github.com/manala/ansible-roles.git
+    type: git
+    version: apt/deb822
diff --git a/elao.app.docker/.manala/docker/Dockerfile.tmpl b/elao.app.docker/.manala/docker/Dockerfile.tmpl
index e00c4b29..c4a7a918 100644
--- a/elao.app.docker/.manala/docker/Dockerfile.tmpl
+++ b/elao.app.docker/.manala/docker/Dockerfile.tmpl
@@ -51,8 +51,6 @@ RUN \
             /var/cache/apt/archives/libssl1.1.deb ; \
     fi \
     {{- end }}
-    # Apt keyrings (debian < bookworm)
-    && mkdir --verbose --parents /etc/apt/keyrings \
     # User
     && addgroup --gid ${MANALA_GROUP_ID} app \
     && adduser --home /home/app --shell /bin/bash --uid ${MANALA_USER_ID} --gecos app --ingroup app --disabled-password app \
@@ -223,11 +221,20 @@ RUN \
     && ldconfig \
     && python3.9 -m pip --no-cache-dir --disable-pip-version-check install \
         ansible==${ANSIBLE_VERSION} \
-{{- else }}
+{{- else if eq (.version|int) 11 }}
         # As controller node
         python3-pip \
     && pip3 --no-cache-dir --disable-pip-version-check install \
         ansible==${ANSIBLE_VERSION} \
+{{- else }}
+        # As controller node
+        pipx \
+        # !!! Not Ready !!!
+        git \
+    && PIPX_HOME="/usr/local/pipx" PIPX_BIN_DIR="/usr/local/bin" \
+        pipx install ansible==${ANSIBLE_VERSION} \
+            --include-deps --pip-args="--no-cache-dir" --verbose \
+    && rm -rf ~/.cache/pip /usr/local/pipx/.cache /usr/local/pipx/logs \
 {{- end }}
     && mkdir --verbose --parents /etc/ansible \
     && printf "[defaults]\n\
diff --git a/elao.app.docker/README.md b/elao.app.docker/README.md
index 5a9cc570..4b93a7c2 100644
--- a/elao.app.docker/README.md
+++ b/elao.app.docker/README.md
@@ -125,7 +125,7 @@ project:
 ##########
 
 system:
-    version: 11
+    version: 12
     #timezone: Etc/UTC # Optional
     #locales: # Optional
     #    default: C.UTF-8
diff --git a/elao.app.docker/test/.manala.yaml b/elao.app.docker/test/.manala.yaml
index 452ced1b..3c5c2d6a 100644
--- a/elao.app.docker/test/.manala.yaml
+++ b/elao.app.docker/test/.manala.yaml
@@ -7,7 +7,7 @@ project:
     ports_prefix: 123
 
 system:
-    version: 11
+    version: 12
     timezone: Europe/Paris
     locales:
         default: C.UTF-8