From b1e70280304b73e7fbad0089aaf2345bc85882f5 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   |  6 +++++-
 elao.app.docker/.manala/ansible/system.yaml         | 11 +++++++++--
 .../.manala/ansible/templates/apt/sources.list.j2   |  3 ---
 elao.app.docker/.manala/docker/Dockerfile.tmpl      | 13 ++++++++++---
 elao.app.docker/README.md                           |  2 +-
 elao.app.docker/test/.manala.yaml                   |  2 +-
 7 files changed, 27 insertions(+), 12 deletions(-)
 delete mode 100644 elao.app.docker/.manala/ansible/templates/apt/sources.list.j2

diff --git a/elao.app.docker/.manala.yaml b/elao.app.docker/.manala.yaml
index 7a2a2c7e..efd9be8c 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 c795439d..59982f19 100644
--- a/elao.app.docker/.manala/ansible/collections/requirements.yaml
+++ b/elao.app.docker/.manala/ansible/collections/requirements.yaml
@@ -8,4 +8,8 @@ collections:
   - community.mongodb
   - community.mysql
   - gluster.gluster
-  - manala.roles
+  # !!! Not Ready !!!
+  #- manala.roles
+  - name: https://github.com/manala/ansible-roles.git
+    type: git
+    version: apt/deb822
diff --git a/elao.app.docker/.manala/ansible/system.yaml b/elao.app.docker/.manala/ansible/system.yaml
index 694acbf4..d8947571 100644
--- a/elao.app.docker/.manala/ansible/system.yaml
+++ b/elao.app.docker/.manala/ansible/system.yaml
@@ -31,10 +31,17 @@
     manala_apt_components:
       - main
 
-    manala_apt_sources_list_template: apt/sources.list.j2
+    manala_apt_sources_list: false
+
+    # !!! Not Ready
+    manala_apt_cache_valid_time: 0
 
     manala_apt_repositories_exclusive: true
-    manala_apt_repositories: "{{ system_apt_repositories }}"
+    manala_apt_repositories:
+      - default
+      - updates
+      - security
+      - "{{ system_apt_repositories }}"
 
     manala_apt_preferences_exclusive: true
     manala_apt_preferences:
diff --git a/elao.app.docker/.manala/ansible/templates/apt/sources.list.j2 b/elao.app.docker/.manala/ansible/templates/apt/sources.list.j2
deleted file mode 100644
index 78a0b64d..00000000
--- a/elao.app.docker/.manala/ansible/templates/apt/sources.list.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://deb.debian.org/debian {{ ansible_facts.distribution_release }} {{ manala_apt_components|flatten|join(' ') }}
-deb http://deb.debian.org/debian {{ ansible_facts.distribution_release }}-updates {{ manala_apt_components|flatten|join(' ') }}
-deb http://security.debian.org/debian-security {{ ansible_facts.distribution_release }}{{ (ansible_facts.distribution_release in ['buster'])|ternary('/updates', '-security') }} {{ manala_apt_components|flatten|join(' ') }}
diff --git a/elao.app.docker/.manala/docker/Dockerfile.tmpl b/elao.app.docker/.manala/docker/Dockerfile.tmpl
index 03f96618..97ccce7b 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)
-    && install --verbose --mode 0755 --directory /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 \
@@ -220,15 +218,24 @@ RUN \
         # As managed node
         python3 \
         python3-apt \
+        # !!! Not Ready !!! (Only useful to temporary get ansible manala.roles collection as a git repo)
+        git \
 {{- if eq (.version|int) 10 }}
     && 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 \
+    && 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 }}
     && install --verbose --mode 0755 --directory /etc/ansible \
     && printf "\
diff --git a/elao.app.docker/README.md b/elao.app.docker/README.md
index c359ff43..84a1b5ed 100644
--- a/elao.app.docker/README.md
+++ b/elao.app.docker/README.md
@@ -127,7 +127,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 0e926b10..d7e98cd9 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