Added linebreaks to prevent j2 rendering bug

This commit is contained in:
Kevin Veen-Birkenbach 2024-01-04 10:15:46 +01:00
parent bac1be9c93
commit 86dc0ac643
11 changed files with 20 additions and 10 deletions

View File

@ -18,7 +18,7 @@ services:
MYSQL_USER: "{{database_username}}" MYSQL_USER: "{{database_username}}"
MYSQL_PASSWORD: "{{database_password}}" MYSQL_PASSWORD: "{{database_password}}"
MYSQL_HOST: {{database_host}}:3306 MYSQL_HOST: {{database_host}}:3306
{% include 'templates/docker-container-depends-on-just-database.yml.j2' %} {% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %} {% include 'templates/docker-container-networks.yml.j2' %}
web: web:

View File

@ -1,7 +1,8 @@
# This template needs to be included in docker-compose.yml # This template needs to be included in docker-compose.yml
networks: networks:
{% if enable_central_database | bool %} {% if enable_central_database | bool %}
central_{{ database_type }}_network: central_{{ database_type }}_network:
external: true external: true
{% endif %} {% endif %}
{{docker_compose_project_name}}_network: {{docker_compose_project_name}}_network:

View File

@ -1,5 +1,6 @@
# This needs to be included in docker-compose.yml which just contain a database volume # This needs to be included in docker-compose.yml which just contain a database volume
{% if not enable_central_database | bool %} {% if not enable_central_database | bool %}
volumes: volumes:
database: database:
{% endif %} {% endif %}

View File

@ -1,5 +1,6 @@
# This template needs to be included in docker-compose.yml which contain a database and additional volumes # This template needs to be included in docker-compose.yml which contain a database and additional volumes
volumes: volumes:
{% if not enable_central_database | bool %} {% if not enable_central_database | bool %}
database: database:
{% endif %} {% endif %}

View File

@ -1,6 +1,7 @@
# This template needs to be included in docker-compose.yml containers which depend on a database and additional containers # This template needs to be included in docker-compose.yml containers which depend on a database and additional containers
depends_on: depends_on:
{% if not enable_central_database | bool %} {% if not enable_central_database | bool %}
database: database:
condition: service_healthy condition: service_healthy
{% endif %} {% endif %}

View File

@ -1,3 +1,4 @@
# This template needs to be included in docker-compose.yml contaienrs, which depend on a database, redis and optional additional volumes # This template needs to be included in docker-compose.yml contaienrs, which depend on a database, redis and optional additional volumes
depends_on: depends_on:
{% if not enable_central_database | bool %} {% if not enable_central_database | bool %}

View File

@ -1,6 +1,7 @@
# This template needs to be included in docker-compose.yml contaienrs, which just depend on a database # This template needs to be included in docker-compose.yml contaienrs, which just depend on a database
{% if not enable_central_database | bool %} {% if not enable_central_database | bool %}
depends_on: depends_on:
database: database:
condition: service_healthy condition: service_healthy
{% endif %} {% endif %}

View File

@ -1,6 +1,7 @@
# This template needs to be included in docker-compose.yml containers # This template needs to be included in docker-compose.yml containers
networks: networks:
{{docker_compose_project_name}}_network: {{docker_compose_project_name}}_network:
{% if enable_central_database | bool %} {% if enable_central_database | bool %}
central_{{ database_type }}_network: central_{{ database_type }}_network:
{% endif %} {% endif %}

View File

@ -1,3 +1,4 @@
# This template needs to be included in docker-compose.yml, which depend on a mariadb database # This template needs to be included in docker-compose.yml, which depend on a mariadb database
{% if not enable_central_database | bool %} {% if not enable_central_database | bool %}
database: database:
@ -21,4 +22,4 @@
retries: 5 retries: 5
networks: networks:
- {{docker_compose_project_name}}_network - {{docker_compose_project_name}}_network
{% endif %} {% endif %}

View File

@ -1,3 +1,4 @@
# This template needs to be included in docker-compose.yml, which depend on a postgres database # This template needs to be included in docker-compose.yml, which depend on a postgres database
{% if not enable_central_database | bool %} {% if not enable_central_database | bool %}
database: database:
@ -19,4 +20,4 @@
target: /var/lib/postgresql/data target: /var/lib/postgresql/data
networks: networks:
- {{docker_compose_project_name}}_network - {{docker_compose_project_name}}_network
{% endif %} {% endif %}

View File

@ -1,3 +1,4 @@
# This template needs to be included in docker-compose.yml, which depend on redis # This template needs to be included in docker-compose.yml, which depend on redis
redis: redis:
image: redis:alpine image: redis:alpine
@ -12,4 +13,4 @@
timeout: 3s timeout: 3s
retries: 30 retries: 30
networks: networks:
- {{docker_compose_project_name}}_network - {{docker_compose_project_name}}_network