mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2024-11-21 20:31:02 +01:00
Adapted variables for template
This commit is contained in:
parent
dc218769c4
commit
f6652ad51c
@ -2,7 +2,7 @@ version: '3.7'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
image: docker.io/akaunting/akaunting:{{version_akaunting}}
|
image: docker.io/akaunting/akaunting:{{version_akaunting}}
|
||||||
|
@ -25,7 +25,7 @@ services:
|
|||||||
- .:/usr/share/nginx/html
|
- .:/usr/share/nginx/html
|
||||||
- .:/var/www
|
- .:/var/www
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
|
|
||||||
maildev:
|
maildev:
|
||||||
image: maildev/maildev
|
image: maildev/maildev
|
||||||
|
@ -17,7 +17,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% 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' %}
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
|
@ -63,7 +63,7 @@ services:
|
|||||||
- "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80"
|
- "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80"
|
||||||
{% include 'templates/docker-container-networks.yml.j2' %}
|
{% 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' %}
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
|
@ -41,7 +41,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% 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' %}
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
redis:
|
redis:
|
||||||
|
@ -21,7 +21,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
database:
|
database:
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
|
@ -14,6 +14,6 @@ services:
|
|||||||
{% include 'templates/docker-container-networks.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
{% include 'templates/docker-container-depends-on.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' %}
|
{% include 'templates/docker-compose-networks.yml.j2' %}
|
@ -4,7 +4,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% 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
|
# Core services
|
||||||
resolver:
|
resolver:
|
||||||
|
@ -3,7 +3,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: tootsuite/mastodon:{{version_mastodon}}
|
image: tootsuite/mastodon:{{version_mastodon}}
|
||||||
|
@ -19,7 +19,7 @@ services:
|
|||||||
{% if not enable_central_database %}
|
{% if not enable_central_database %}
|
||||||
depends_on:
|
depends_on:
|
||||||
- database
|
- database
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ services:
|
|||||||
{% if not enable_central_database %}
|
{% if not enable_central_database %}
|
||||||
depends_on:
|
depends_on:
|
||||||
- database
|
- database
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
element:
|
element:
|
||||||
|
@ -26,7 +26,7 @@ services:
|
|||||||
- "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro"
|
- "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro"
|
||||||
- "data:/var/www/html: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' %}
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
@ -17,7 +17,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- database
|
- database
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
web:
|
web:
|
||||||
|
@ -33,7 +33,7 @@ x-op-app: &app
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ services:
|
|||||||
{% if not enable_central_database %}
|
{% if not enable_central_database %}
|
||||||
- database
|
- database
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
@ -2,7 +2,7 @@ version: '2'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-service-redis.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- database
|
- database
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
|
@ -20,7 +20,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- database
|
- database
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
database:
|
database:
|
||||||
|
Loading…
Reference in New Issue
Block a user