From 554f9f533db54cbc354b2ce35429a7ce234eb87d Mon Sep 17 00:00:00 2001
From: Yhael S <yhaelopez@gmail.com>
Date: Fri, 6 Oct 2023 23:55:18 -0500
Subject: [PATCH] last fixes

---
 .env.example               |  7 +++++--
 docker-compose.yml         | 36 ++++++++++++++++++++++--------------
 odoo/fix-manifest.py       |  2 +-
 odoo/third-party-addons.sh |  4 ++++
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/.env.example b/.env.example
index 3182073..644c024 100644
--- a/.env.example
+++ b/.env.example
@@ -2,7 +2,7 @@
 #    Main Configuration    #
 #--------------------------#
 # Odoo
-APP_ENV=staging
+APP_ENV=local
 INIT=
 UPDATE=
 LOAD=base,web,session_redis,attachment_s3
@@ -68,10 +68,12 @@ REDIS_URL=
 REDIS_PREFIX=odoo
 REDIS_EXPIRATION=604800
 REDIS_EXPIRATION_ANONYMOUS=10800
+REDIS_DATA=/var/lib/keydb
 
 # Filesystem
 S3_VIRTUAL_HOST=s3.odoocker.test
 S3_API_PORT=9000
+S3_CONSOLE_PORT=9001
 AWS_ACCESS_KEY_ID=myaccesskey
 AWS_SECRET_ACCESS_KEY=mysecretkey
 AWS_BUCKETNAME=odoocker
@@ -292,7 +294,8 @@ MINIO_ROOT_PASSWORD=${AWS_SECRET_ACCESS_KEY}
 MINIO_VIRTUAL_HOST=${S3_VIRTUAL_HOST}
 MINIO_BROWSER_REDIRECT_URL=http://${MINIO_VIRTUAL_HOST}
 MINIO_API_PORT=${S3_API_PORT}
-MINIO_VIRTUAL_PORT=9001
+MINIO_CONSOLE_PORT=${S3_CONSOLE_PORT}
+MINIO_DATA=/data
 
 #-------------#
 #   PgAdmin   #
diff --git a/docker-compose.yml b/docker-compose.yml
index a951336..3ee8949 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,6 +27,19 @@ services:
       - PASSWORD=${DB_PASSWORD}
       - ODOO_TAG
       - THIRD_PARTY_ADDONS
+      - ODOO_SESSION_REDIS
+      - ODOO_SESSION_REDIS_HOST
+      - ODOO_SESSION_REDIS_PORT
+      - ODOO_SESSION_REDIS_PASSWORD
+      - ODOO_SESSION_REDIS_URL
+      - ODOO_SESSION_REDIS_PREFIX
+      - ODOO_SESSION_REDIS_EXPIRATION
+      - ODOO_SESSION_REDIS_EXPIRATION_ANONYMOUS
+      - AWS_HOST
+      - AWS_REGION
+      - AWS_ACCESS_KEY_ID
+      - AWS_SECRET_ACCESS_KEY
+      - AWS_BUCKETNAME
     networks:
       - internal
 
@@ -52,11 +65,6 @@ services:
       - PGADMING_DB_NAME
       - PGADMING_DB_USER
       - PGADMIN_DB_PASSWORD
-      - AWS_HOST
-      - AWS_REGION
-      - AWS_ACCESS_KEY_ID
-      - AWS_SECRET_ACCESS_KEY
-      - AWS_BUCKETNAME
     networks:
       - internal
 
@@ -64,27 +72,27 @@ services:
     image: eqalpha/keydb:${REDIS_TAG}
     platform: linux/amd64
     ports:
-      - 6379:6379
+      - ${REDIS_PORT}:${REDIS_PORT}
     restart: unless-stopped
+    volumes:
+      - redis-data:${REDIS_DATA}
     networks:
       - internal
-    volumes:
-      - redis-data:/var/lib/keydb
 
   s3:
     image: minio/minio:${S3_TAG}
     environment:
       - MINIO_ROOT_USER
       - MINIO_ROOT_PASSWORD
-      - VIRTUAL_HOST=${MINIO_VIRTUAL_HOST}
-      - VIRTUAL_PORT=9001
       - MINIO_BROWSER_REDIRECT_URL
-    command: server /data --console-address ":9001"
+      - VIRTUAL_HOST=${MINIO_VIRTUAL_HOST}
+      - VIRTUAL_PORT=${MINIO_CONSOLE_PORT}
+    command: server ${MINIO_DATA} --console-address ":${MINIO_CONSOLE_PORT}"
     volumes:
-      - s3-data:/data
+      - s3-data:${MINIO_DATA}
     ports:
-      - 9000:9000
-      - 9001:9001
+      - ${MINIO_API_PORT}:${MINIO_API_PORT}
+      - ${MINIO_CONSOLE_PORT}:${MINIO_CONSOLE_PORT}
     networks:
       - internal
 
diff --git a/odoo/fix-manifest.py b/odoo/fix-manifest.py
index 5879cd8..5075e79 100644
--- a/odoo/fix-manifest.py
+++ b/odoo/fix-manifest.py
@@ -16,7 +16,7 @@ manifest_dict = eval(''.join(lines[start_index:end_index + 1]))
 
 # Modify the manifest dictionary
 manifest_dict['installable'] = True
-manifest_dict['auto_install'] = False
+manifest_dict['auto_install'] = True
 
 # Construct the modified manifest string
 modified_manifest_lines = ['{\n']
diff --git a/odoo/third-party-addons.sh b/odoo/third-party-addons.sh
index e25f60d..9d1ec73 100755
--- a/odoo/third-party-addons.sh
+++ b/odoo/third-party-addons.sh
@@ -10,8 +10,12 @@ if [ ! -d "odoo-cloud-platform" ]; then
     cp -r odoo-cloud-platform/attachment_s3 ${THIRD_PARTY_ADDONS}/attachment_s3
 fi
 
+# Define the path to the manifest file
+redis_manifest="${THIRD_PARTY_ADDONS}/session_redis/__manifest__.py"
 # Define the path to the manifest file
 s3_manifest="${THIRD_PARTY_ADDONS}/attachment_s3/__manifest__.py"
 
 # Modify the manifest file
+# python3 /fix-manifest.py $redis_manifest
 python3 /fix-manifest.py $s3_manifest
+python3 /fix-manifest.py $redis_manifest