Compare commits

...

2 Commits

Author SHA1 Message Date
mate
59fe076ed8 Merge branch 'dev' of http://gitea.anbhub.com:3000/gitea/bross_hms into dev
Some checks failed
Update odoo 18 / update (push) Has been cancelled
2024-10-29 17:38:31 +04:00
mate
b87c76a732 Change on node 4 2024-10-29 17:38:03 +04:00
3 changed files with 7 additions and 9 deletions

2
.env
View File

@ -15,5 +15,5 @@ PASSWORD="odoo"
ADDONS="--addons-path=/opt/odoo/addons/,/opt/odoo/customaddons/$CUSTOMADDONS_DIR" ADDONS="--addons-path=/opt/odoo/addons/,/opt/odoo/customaddons/$CUSTOMADDONS_DIR"
# ARGS="" # ARGS=""
# ARGS="-d bross" # 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" # DEBUG="-m debugpy --listen 0.0.0.0:5678 --wait-for-client"

View File

@ -5,17 +5,17 @@ services:
command: > command: >
-c max_wal_size=4GB -c max_wal_size=4GB
env_file: env_file:
.env dev.env
# ports: # ports:
# - 5433:5432 # - 5433:5432
volumes: volumes:
- postgres_17_data:/var/lib/postgresql/data/ - postgres_17_odoo_data:/var/lib/postgresql/data/
odoo: odoo:
image: odoo-dev:18 image: odoo-dev:18
restart: unless-stopped restart: unless-stopped
env_file: env_file:
.env dev.env
# ports: # ports:
# - 5678:5678 # - 5678:5678
# - 8069:8069 # - 8069:8069
@ -32,8 +32,6 @@ services:
nginx: nginx:
image: nginx:1.27.0-alpine3.19-slim image: nginx:1.27.0-alpine3.19-slim
restart: unless-stopped restart: unless-stopped
env_file:
.env
ports: ports:
- 3080:80 - 3080:80
volumes: volumes:
@ -42,7 +40,7 @@ services:
- odoo - odoo
volumes: volumes:
postgres_17_data: postgres_17_odoo_data:
name: postgres_17_data name: postgres_17_odoo_data
odoo_18_filestore: odoo_18_filestore:
name: odoo_18_filestore name: odoo_18_filestore

View File

@ -1,5 +1,5 @@
[options] [options]
admin_passwd = $pbkdf2-sha512$25000$ca4VYuyd03rP.Z.zNsbYmw$RmR191OydA7ha820NAhyDYVkGlJsdWiSq/mwkMV/x8fbx0Qh4wOHR0JJYo/7z0nYOKygLPYU38S7C4g355k4HA admin_passwd = $pbkdf2-sha512$25000$633v3ZuT0novhVAqhdDamw$fKiY4ilP5EF8xLv66kljQ1WWppTQgraLUMDANMT3rlx01C6luc27z3PPj.wbgTPy8VUvL6LPjLGSHdlqlHXn6A
;admin_passwd = admin ;admin_passwd = admin
;addons_path = /mnt/extra-addons ;addons_path = /mnt/extra-addons
;data_dir = /var/lib/odoo ;data_dir = /var/lib/odoo