|
@ -14,7 +14,7 @@ docker-compose: |
|
|
tty: true |
|
|
tty: true |
|
|
environment: |
|
|
environment: |
|
|
INITIAL_LANG: fr_FR |
|
|
INITIAL_LANG: fr_FR |
|
|
LIST_DB: 'true' |
|
|
|
|
|
|
|
|
LIST_DB: "true" |
|
|
|
|
|
|
|
|
default-options: |
|
|
default-options: |
|
|
workers: 1 |
|
|
workers: 1 |
|
@ -63,10 +63,15 @@ uses: |
|
|
- !bash-stdout | |
|
|
- !bash-stdout | |
|
|
workers=$(relation-base-compose-get workers 2>/dev/null) |
|
|
workers=$(relation-base-compose-get workers 2>/dev/null) |
|
|
workers=${workers:-1} |
|
|
workers=${workers:-1} |
|
|
if [ "$workers" -gt 1 ]; then |
|
|
|
|
|
|
|
|
version=$(relation-base-compose-get version 2>/dev/null) |
|
|
|
|
|
if [ "$workers" -gt 1 ] && [ $version -lt 16]; then |
|
|
echo "ProxyPass /longpolling/ http://${MASTER_BASE_SERVICE_NAME}:8072/longpolling/" |
|
|
echo "ProxyPass /longpolling/ http://${MASTER_BASE_SERVICE_NAME}:8072/longpolling/" |
|
|
echo "ProxyPassReverse /longpolling/ http://${MASTER_BASE_SERVICE_NAME}:8072/longpolling/" |
|
|
echo "ProxyPassReverse /longpolling/ http://${MASTER_BASE_SERVICE_NAME}:8072/longpolling/" |
|
|
fi |
|
|
fi |
|
|
|
|
|
if [ "$workers" -gt 1 ] && [ $version -ge 16]; then |
|
|
|
|
|
echo "ProxyPass /websocket/ http://${MASTER_BASE_SERVICE_NAME}:8072/websocket/" |
|
|
|
|
|
echo "ProxyPassReverse /websocket/ http://${MASTER_BASE_SERVICE_NAME}:8072/websocket/" |
|
|
|
|
|
fi |
|
|
backup: |
|
|
backup: |
|
|
constraint: recommended |
|
|
constraint: recommended |
|
|
auto: pair |
|
|
auto: pair |
|
@ -81,7 +86,6 @@ uses: |
|
|
## - must start with a '/', will start from $SERVICE_DATASTORE |
|
|
## - must start with a '/', will start from $SERVICE_DATASTORE |
|
|
exclude-patterns: |
|
|
exclude-patterns: |
|
|
- "/var/lib/odoo/sessions/" |
|
|
- "/var/lib/odoo/sessions/" |
|
|
|
|
|
|
|
|
# network-isolation: |
|
|
# network-isolation: |
|
|
# whitelist: ## required external services used by this service |
|
|
# whitelist: ## required external services used by this service |
|
|
# - www.google.com |
|
|
# - www.google.com |
|
|