From e7669c880acbb542cca88fb0ca592d4d1ba8fe58 Mon Sep 17 00:00:00 2001
From: Armand Gillot <armand.gillot@gmail.com>
Date: Thu, 7 Dec 2023 17:53:42 +0100
Subject: [PATCH] update for adding app

---
 apps/odoo/config.json        | 10 +++++++++-
 apps/odoo/docker-compose.yml | 10 +++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/odoo/config.json b/apps/odoo/config.json
index 4b6a20a8..cebfbb66 100644
--- a/apps/odoo/config.json
+++ b/apps/odoo/config.json
@@ -5,7 +5,7 @@
   "exposable": true,
   "id": "odoo",
   "tipi_version": 1,
-  "version": "17.0",
+  "version": "17",
   "categories": [
     "utilities",
     "finance",
@@ -15,6 +15,14 @@
   "short_desc": "Open-source business management software with modular applications for streamlined operations.",
   "author": "armandgillot",
   "source": "https://github.com/odoo/odoo",
+  "form_fields": [
+    {
+      "type": "random",
+      "label": "odoo postgres password.",
+      "min": 32,
+      "env_variable": "ODOO_POSTGRES_PASSWORD"
+    }
+  ],
   "supported_architectures": [
     "arm64",
     "amd64"
diff --git a/apps/odoo/docker-compose.yml b/apps/odoo/docker-compose.yml
index 3113cba7..6aa4aac3 100644
--- a/apps/odoo/docker-compose.yml
+++ b/apps/odoo/docker-compose.yml
@@ -7,11 +7,11 @@ services:
     user: root
     environment:
       - POSTGRES_USER=odoo
-      - POSTGRES_PASSWORD=odoo17@2023      
+      - POSTGRES_PASSWORD=${ODOO_POSTGRES_PASSWORD}
       - POSTGRES_DB=postgres
     restart: unless-stopped
     volumes:
-        - ${APP_DATA_DIR}/postgresql:/var/lib/postgresql/data
+        - ${APP_DATA_DIR}/data/postgresql:/var/lib/postgresql/data
     networks:
       - tipi_main_network
 
@@ -28,11 +28,11 @@ services:
     environment:
       - HOST=odoodb
       - USER=odoo
-      - PASSWORD=odoo17@2023
+      - PASSWORD=${ODOO_POSTGRES_PASSWORD}
     volumes:
       # - ./entrypoint.sh:/entrypoint.sh   # if you want to install additional Python packages, uncomment this line!
-      - ${APP_DATA_DIR}/addons:/mnt/extra-addons
-      - ${APP_DATA_DIR}/etc:/etc/odoo
+      - ${APP_DATA_DIR}/data/addons:/mnt/extra-addons
+      - ${APP_DATA_DIR}/data/etc:/etc/odoo
     restart: unless-stopped
     networks:
       - tipi_main_network