[IMP] Use unique db service name for project, version and environment

Tecnativa · Jan 29, 2025 · eaa7e05 · eaa7e05
1 parent 772d808
commit eaa7e05
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/devel.yaml.jinja b/devel.yaml.jinja
@@ -1,4 +1,6 @@
 {%- import "_macros.jinja" as macros -%}
+{%- import "_traefik2_labels.yml.jinja" as traefik2_labels -%}
+{%- set _key = traefik2_labels.key(project_name, odoo_version, "test") -%}
 {% set whitelisted_hosts = (
   "cdnjs.cloudflare.com",
   "fonts.googleapis.com",
@@ -56,7 +58,7 @@ services:
       - ./odoo/custom:/opt/odoo/custom:ro,z
       - ./odoo/auto:/opt/odoo/auto:rw,z
     depends_on:
-      - db
+      - {{ _key }}-db
       {% for host in whitelisted_hosts -%}
       - proxy_{{ host|replace(".", "_") }}
       {% endfor -%}
@@ -77,7 +79,7 @@ services:
       {%- endif %}
 
   {% if postgres_version -%}
-  db:
+  {{ _key }}-db:
     extends:
       file: common.yaml
       service: db
@@ -92,9 +94,9 @@ services:
     ports:
       - "127.0.0.1:{{ macros.version_major(odoo_version) }}081:8081"
     environment:
-      DATABASE_URL: postgres://{{ postgres_username }}:odoopassword@db:5432/devel?sslmode=disable
+      DATABASE_URL: postgres://{{ postgres_username }}:odoopassword@{{ _key }}-db:5432/devel?sslmode=disable
     depends_on:
-      - db
+      - {{ _key }}-db
 
   smtp:
     extends:

diff --git a/prod.yaml.jinja b/prod.yaml.jinja
@@ -31,7 +31,7 @@ services:
       SMTP_SERVER: smtplocal
       {%- endif %}
     depends_on:
-      - db
+      - {{ _key }}-db
       {%- if smtp_relay_host %}
       - smtp
       {%- endif %}
@@ -83,7 +83,7 @@ services:
       {%- endif %}
 
   {% if postgres_version -%}
-  db:
+  {{ _key }}-db:
     extends:
       file: common.yaml
       service: db
@@ -137,7 +137,7 @@ services:
       - .docker/db-access.env
     restart: unless-stopped
     depends_on:
-      - db
+      - {{ _key }}-db
       {%- if smtp_relay_host %}
       - smtp
       {%- endif %}

diff --git a/test.yaml.jinja b/test.yaml.jinja
@@ -29,7 +29,7 @@ services:
     hostname: {{ macros.first_main_domain(domains_test)|tojson }}
     {%- endif %}
     depends_on:
-      - db
+      - {{ _key }}-db
       - smtp
     networks:
       default:
@@ -57,7 +57,7 @@ services:
       - --max-cron-threads=1
 
   {% if postgres_version -%}
-  db:
+  {{ _key }}-db:
     extends:
       file: common.yaml
       service: db