kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-07-18 06:24:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solved condition and tab bugs

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-07-07 21:44:33 +02:00
parent f254c9711d
commit a100c9e63d
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/docker-compose/templates/base.yml.j2
View File

@ -1,11 +1,11 @@
{# Base template for all docker-compose.yml.j2 #} {# Base template for all docker-compose.yml.j2 #}
services: services:
{# Load Database #} {# Load Database #}
{% if applications[application_id].docker.database.enabled | default(false) | bool %} {% if applications[application_id].docker.services.database.enabled | default(false) | bool %}
{% include 'roles/docker-central-database/templates/services/main.yml.j2' %} {% include 'roles/docker-central-database/templates/services/main.yml.j2' %}
{% endif %} {% endif %}
{# Load Redis #} {# Load Redis #}
{% if applications[application_id].docker.redis.enabled | default(false) | bool %} {% if applications[application_id].docker.services.redis.enabled | default(false) | bool %}
{% include 'roles/docker-redis/templates/service.yml.j2' %} {% include 'roles/docker-redis/templates/service.yml.j2' %}
{% endif %} {% endif %}
{# Load OAuth2 Proxy #} {# Load OAuth2 Proxy #}

10
roles/docker-container/templates/depends_on_dmbs.j2
View File

@ -1,18 +1,18 @@
{# This template needs to be included in docker-compose.yml containers, which depend on a database, redis and optional additional volumes #} {# This template needs to be included in docker-compose.yml containers, which depend on a database, redis and optional additional volumes #}
{% if applications | is_feature_enabled('central_database', application_id) {% if applications | is_feature_enabled('central_database', application_id)
and not (applications[application_id].docker.redis.enabled and not (applications[application_id].docker.services.redis.enabled
| default(false) | default(false)
| bool) %} | bool) %}
depends_on: [] depends_on: []
{% else %} {% else %}
depends_on: depends_on:
{% if not applications | is_feature_enabled('central_database', application_id) %} {% if not applications | is_feature_enabled('central_database', application_id) %}
database: database:
condition: service_healthy condition: service_healthy
{% endif %} {% endif %}
{% if applications[application_id].docker.redis.enabled | default(false) | bool %} {% if applications[application_id].docker.services.redis.enabled | default(false) | bool %}
redis: redis:
condition: service_healthy condition: service_healthy
{% endif %} {% endif %}
{% endif %} {% endif %}
{{ "\n" }} {{ "\n" }}