From 649ab899d218a28f13d64adbc8239207061f0927 Mon Sep 17 00:00:00 2001 From: Yann Autissier Date: Wed, 6 Apr 2022 23:01:15 +0000 Subject: [PATCH] fix kwkhtmltopdf server url --- docker/docker-compose.app.yml | 3 +++ docker/docker-compose.yml | 2 ++ docker/odoo14/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose.app.yml b/docker/docker-compose.app.yml index ffb01f1..ec060fa 100644 --- a/docker/docker-compose.app.yml +++ b/docker/docker-compose.app.yml @@ -3,6 +3,9 @@ version: "3.6" services: kwkhtmltopdf: image: acsone/kwkhtmltopdf + networks: + private: + restart: always odoo14: depends_on: - postgres diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9738510..c4dbcff 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -24,6 +24,7 @@ services: - DB_NAME=${ODOO14_DB_NAME} - DB_PASSWORD=${ODOO14_DB_PASSWORD} - DB_USER=${ODOO14_DB_USER} + - KWKHTMLTOPDF_SERVER_URL=${ODOO14_KWKHTMLTOPDF_SERVER_URL:-http://kwkhtmltopdf:8080} - LIST_DB=${ODOO14_LIST_DB:-False} - LOG_DB=${ODOO14_LOG_DB:-False} - LOG_HANDLER=${ODOO14_LOG_HANDLER:-:INFO} @@ -50,6 +51,7 @@ services: ports: - 8069 - 8072 + restart: always volumes: - odoo14:/data/odoo diff --git a/docker/odoo14/Dockerfile b/docker/odoo14/Dockerfile index 49c8aa4..05c4842 100644 --- a/docker/odoo14/Dockerfile +++ b/docker/odoo14/Dockerfile @@ -67,7 +67,7 @@ ENV \ EMAIL_FROM=False \ HTTP_PORT=8069 \ HTTP_ENABLE=True \ - KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf \ + KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf:8080 \ LANG=C.UTF-8 \ LC_ALL=C.UTF-8 \ LIMIT_MEMORY_HARD=1395864371 \