From 63a88cbdfb4c340d16bfb8ffca821845209ac1bb Mon Sep 17 00:00:00 2001 From: josep-tecnativa Date: Thu, 21 Nov 2024 11:40:28 +0100 Subject: [PATCH] [ADD] External connection to db for test instance - Added traefik 3 labels - Added traefik 2 configuration --- copier.yml | 14 ++++++++++++++ test.yaml.jinja | 21 +++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/copier.yml b/copier.yml index 0e45c531..dfaf91fb 100644 --- a/copier.yml +++ b/copier.yml @@ -428,6 +428,20 @@ postgres_cidr_whitelist: ⚠️ It must be a list. And this is only supported if you deploy with Traefik 2+. +postgres_exposed_test: + default: false + type: bool + help: >- + Do you also want to expose database service for demo? + +postgres_exposed_port_test: + default: 5432 + type: int + when: &db_exposed_test "{{ postgres_exposed and traefik_version != 3 }}" + help: >- + Indicate the port to connect to the demo database.. + It must not be de same of production database port + odoo_dbfilter: default: "^{{ postgres_dbname }}" type: str diff --git a/test.yaml.jinja b/test.yaml.jinja index f45a063c..7f40f7a4 100644 --- a/test.yaml.jinja +++ b/test.yaml.jinja @@ -2,6 +2,7 @@ {%- import "_traefik1_labels.yml.jinja" as traefik1_labels -%} {%- import "_traefik2_labels.yml.jinja" as traefik2_labels -%} {%- import "_traefik3_labels.yml.jinja" as traefik3_labels -%} +{%- import "_traefik3_paths_labels.yml.jinja" as traefik3_labels_2 -%} {%- set _key = traefik2_labels.key(project_name, odoo_version, "test") -%} version: "2.4" @@ -59,6 +60,26 @@ services: env_file: - .docker/db-creation.env restart: unless-stopped + {%- if postgres_exposed_test %} + {%- if traefik_version == 3 %} + networks: + default: + inverseproxy_shared: + labels: + traefik.enable: "true" + traefik.docker.network: "inverseproxy_shared" + {{- traefik3_labels_2.database( + domains_test, + postgres_cidr_whitelist, + _key, + postgres_exposed_port_test, + project_name, + ) }} + {%- else %} + ports: + - "{{ postgres_exposed_port_test }}:5432" + {%- endif %} + {%- endif %} {%- endif %} smtp: