Adapted variables for template

This commit is contained in:
Kevin Veen-Birkenbach 2024-01-02 21:40:48 +01:00
parent c863700dbf
commit 884b9370bb
18 changed files with 18 additions and 18 deletions

View File

@ -2,7 +2,7 @@ version: '3.7'
services:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
application:
image: docker.io/akaunting/akaunting:{{version_akaunting}}

View File

@ -25,7 +25,7 @@ services:
- .:/usr/share/nginx/html
- .:/var/www
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
maildev:
image: maildev/maildev

View File

@ -17,7 +17,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:

View File

@ -63,7 +63,7 @@ services:
- "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80"
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:

View File

@ -41,7 +41,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
redis:

View File

@ -21,7 +21,7 @@ services:
depends_on:
database:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:

View File

@ -14,6 +14,6 @@ services:
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}

View File

@ -4,7 +4,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
# Core services
resolver:

View File

@ -3,7 +3,7 @@ services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
web:
image: tootsuite/mastodon:{{version_mastodon}}

View File

@ -19,7 +19,7 @@ services:
{% if not enable_central_database %}
depends_on:
- database
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% endif %}

View File

@ -19,7 +19,7 @@ services:
{% if not enable_central_database %}
depends_on:
- database
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% endif %}
element:

View File

@ -26,7 +26,7 @@ services:
- "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro"
- "data:/var/www/html:ro"
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:

View File

@ -17,7 +17,7 @@ services:
depends_on:
- database
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% endif %}
web:

View File

@ -33,7 +33,7 @@ x-op-app: &app
services:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
networks:
- backend

View File

@ -18,7 +18,7 @@ services:
{% if not enable_central_database %}
- database
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% endif %}
{% include 'templates/docker-service-redis.yml.j2' %}

View File

@ -2,7 +2,7 @@ version: '2'
services:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}

View File

@ -21,7 +21,7 @@ services:
depends_on:
- database
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
{% endif %}
{% include 'templates/docker-compose-volumes.yml.j2' %}

View File

@ -20,7 +20,7 @@ services:
depends_on:
- database
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
volumes:
database: