From b87c76a7323597e761c3003d8945ab35c79607d8 Mon Sep 17 00:00:00 2001 From: mate Date: Tue, 29 Oct 2024 17:38:03 +0400 Subject: [PATCH] Change on node 4 --- .env | 2 +- docker-compose-dev.yml | 12 +++++------- odoo.conf | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.env b/.env index e947011..ab11788 100644 --- a/.env +++ b/.env @@ -15,5 +15,5 @@ PASSWORD="odoo" ADDONS="--addons-path=/opt/odoo/addons/,/opt/odoo/customaddons/$CUSTOMADDONS_DIR" # ARGS="" # ARGS="-d bross" -ARGS="-d cybro_hms -u bross_hms,exely_integration,bross_bank_management" +#ARGS="-d cybro_hms -u bross_hms,exely_integration,bross_bank_management" # DEBUG="-m debugpy --listen 0.0.0.0:5678 --wait-for-client" diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 9c07e8b..101f6d7 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -5,17 +5,17 @@ services: command: > -c max_wal_size=4GB env_file: - .env + dev.env # ports: # - 5433:5432 volumes: - - postgres_17_data:/var/lib/postgresql/data/ + - postgres_17_odoo_data:/var/lib/postgresql/data/ odoo: image: odoo-dev:18 restart: unless-stopped env_file: - .env + dev.env # ports: # - 5678:5678 # - 8069:8069 @@ -32,8 +32,6 @@ services: nginx: image: nginx:1.27.0-alpine3.19-slim restart: unless-stopped - env_file: - .env ports: - 3080:80 volumes: @@ -42,7 +40,7 @@ services: - odoo volumes: - postgres_17_data: - name: postgres_17_data + postgres_17_odoo_data: + name: postgres_17_odoo_data odoo_18_filestore: name: odoo_18_filestore diff --git a/odoo.conf b/odoo.conf index 50ee5cf..c4b84d8 100644 --- a/odoo.conf +++ b/odoo.conf @@ -1,5 +1,5 @@ [options] -admin_passwd = $pbkdf2-sha512$25000$ca4VYuyd03rP.Z.zNsbYmw$RmR191OydA7ha820NAhyDYVkGlJsdWiSq/mwkMV/x8fbx0Qh4wOHR0JJYo/7z0nYOKygLPYU38S7C4g355k4HA +admin_passwd = $pbkdf2-sha512$25000$633v3ZuT0novhVAqhdDamw$fKiY4ilP5EF8xLv66kljQ1WWppTQgraLUMDANMT3rlx01C6luc27z3PPj.wbgTPy8VUvL6LPjLGSHdlqlHXn6A ;admin_passwd = admin ;addons_path = /mnt/extra-addons ;data_dir = /var/lib/odoo