last fixes

This commit is contained in:
Yhael S
2023-10-06 23:55:18 -05:00
parent 0cd36b92a3
commit 554f9f533d
4 changed files with 32 additions and 17 deletions

View File

@@ -2,7 +2,7 @@
# Main Configuration # # Main Configuration #
#--------------------------# #--------------------------#
# Odoo # Odoo
APP_ENV=staging APP_ENV=local
INIT= INIT=
UPDATE= UPDATE=
LOAD=base,web,session_redis,attachment_s3 LOAD=base,web,session_redis,attachment_s3
@@ -68,10 +68,12 @@ REDIS_URL=
REDIS_PREFIX=odoo REDIS_PREFIX=odoo
REDIS_EXPIRATION=604800 REDIS_EXPIRATION=604800
REDIS_EXPIRATION_ANONYMOUS=10800 REDIS_EXPIRATION_ANONYMOUS=10800
REDIS_DATA=/var/lib/keydb
# Filesystem # Filesystem
S3_VIRTUAL_HOST=s3.odoocker.test S3_VIRTUAL_HOST=s3.odoocker.test
S3_API_PORT=9000 S3_API_PORT=9000
S3_CONSOLE_PORT=9001
AWS_ACCESS_KEY_ID=myaccesskey AWS_ACCESS_KEY_ID=myaccesskey
AWS_SECRET_ACCESS_KEY=mysecretkey AWS_SECRET_ACCESS_KEY=mysecretkey
AWS_BUCKETNAME=odoocker AWS_BUCKETNAME=odoocker
@@ -292,7 +294,8 @@ MINIO_ROOT_PASSWORD=${AWS_SECRET_ACCESS_KEY}
MINIO_VIRTUAL_HOST=${S3_VIRTUAL_HOST} MINIO_VIRTUAL_HOST=${S3_VIRTUAL_HOST}
MINIO_BROWSER_REDIRECT_URL=http://${MINIO_VIRTUAL_HOST} MINIO_BROWSER_REDIRECT_URL=http://${MINIO_VIRTUAL_HOST}
MINIO_API_PORT=${S3_API_PORT} MINIO_API_PORT=${S3_API_PORT}
MINIO_VIRTUAL_PORT=9001 MINIO_CONSOLE_PORT=${S3_CONSOLE_PORT}
MINIO_DATA=/data
#-------------# #-------------#
# PgAdmin # # PgAdmin #

View File

@@ -27,6 +27,19 @@ services:
- PASSWORD=${DB_PASSWORD} - PASSWORD=${DB_PASSWORD}
- ODOO_TAG - ODOO_TAG
- THIRD_PARTY_ADDONS - 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: networks:
- internal - internal
@@ -52,11 +65,6 @@ services:
- PGADMING_DB_NAME - PGADMING_DB_NAME
- PGADMING_DB_USER - PGADMING_DB_USER
- PGADMIN_DB_PASSWORD - PGADMIN_DB_PASSWORD
- AWS_HOST
- AWS_REGION
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- AWS_BUCKETNAME
networks: networks:
- internal - internal
@@ -64,27 +72,27 @@ services:
image: eqalpha/keydb:${REDIS_TAG} image: eqalpha/keydb:${REDIS_TAG}
platform: linux/amd64 platform: linux/amd64
ports: ports:
- 6379:6379 - ${REDIS_PORT}:${REDIS_PORT}
restart: unless-stopped restart: unless-stopped
volumes:
- redis-data:${REDIS_DATA}
networks: networks:
- internal - internal
volumes:
- redis-data:/var/lib/keydb
s3: s3:
image: minio/minio:${S3_TAG} image: minio/minio:${S3_TAG}
environment: environment:
- MINIO_ROOT_USER - MINIO_ROOT_USER
- MINIO_ROOT_PASSWORD - MINIO_ROOT_PASSWORD
- VIRTUAL_HOST=${MINIO_VIRTUAL_HOST}
- VIRTUAL_PORT=9001
- MINIO_BROWSER_REDIRECT_URL - 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: volumes:
- s3-data:/data - s3-data:${MINIO_DATA}
ports: ports:
- 9000:9000 - ${MINIO_API_PORT}:${MINIO_API_PORT}
- 9001:9001 - ${MINIO_CONSOLE_PORT}:${MINIO_CONSOLE_PORT}
networks: networks:
- internal - internal

View File

@@ -16,7 +16,7 @@ manifest_dict = eval(''.join(lines[start_index:end_index + 1]))
# Modify the manifest dictionary # Modify the manifest dictionary
manifest_dict['installable'] = True manifest_dict['installable'] = True
manifest_dict['auto_install'] = False manifest_dict['auto_install'] = True
# Construct the modified manifest string # Construct the modified manifest string
modified_manifest_lines = ['{\n'] modified_manifest_lines = ['{\n']

View File

@@ -10,8 +10,12 @@ if [ ! -d "odoo-cloud-platform" ]; then
cp -r odoo-cloud-platform/attachment_s3 ${THIRD_PARTY_ADDONS}/attachment_s3 cp -r odoo-cloud-platform/attachment_s3 ${THIRD_PARTY_ADDONS}/attachment_s3
fi fi
# Define the path to the manifest file
redis_manifest="${THIRD_PARTY_ADDONS}/session_redis/__manifest__.py"
# Define the path to the manifest file # Define the path to the manifest file
s3_manifest="${THIRD_PARTY_ADDONS}/attachment_s3/__manifest__.py" s3_manifest="${THIRD_PARTY_ADDONS}/attachment_s3/__manifest__.py"
# Modify the manifest file # Modify the manifest file
# python3 /fix-manifest.py $redis_manifest
python3 /fix-manifest.py $s3_manifest python3 /fix-manifest.py $s3_manifest
python3 /fix-manifest.py $redis_manifest