mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2024-11-09 22:41:03 +01:00
Solved nextcloud bugs
This commit is contained in:
parent
51f47f158e
commit
6cc48f9dc5
@ -54,7 +54,9 @@ services:
|
|||||||
- "dkim:/dkim"
|
- "dkim:/dkim"
|
||||||
{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
|
{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
|
||||||
resolver:
|
resolver:
|
||||||
|
condition: service_started
|
||||||
front:
|
front:
|
||||||
|
condition: service_started
|
||||||
logging:
|
logging:
|
||||||
driver: journald
|
driver: journald
|
||||||
dns:
|
dns:
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
# 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 %}
|
||||||
@ -6,3 +5,4 @@ networks:
|
|||||||
external: true
|
external: true
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{docker_compose_project_name}}_network:
|
{{docker_compose_project_name}}_network:
|
||||||
|
{{ "\n" }}
|
@ -1,6 +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 %}
|
||||||
|
{{ "\n" }}
|
@ -1,6 +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 %}
|
||||||
|
{{ "\n" }}
|
@ -1,7 +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 %}
|
||||||
|
{{ "\n" }}
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
# 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 %}
|
||||||
@ -7,3 +6,4 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
redis:
|
redis:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
{{ "\n" }}
|
@ -1,7 +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 %}
|
||||||
|
{{ "\n" }}
|
@ -1,7 +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 %}
|
||||||
|
{{ "\n" }}
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
# 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:
|
||||||
@ -23,3 +22,4 @@
|
|||||||
networks:
|
networks:
|
||||||
- {{docker_compose_project_name}}_network
|
- {{docker_compose_project_name}}_network
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{{ "\n" }}
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
# 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:
|
||||||
@ -21,3 +20,4 @@
|
|||||||
networks:
|
networks:
|
||||||
- {{docker_compose_project_name}}_network
|
- {{docker_compose_project_name}}_network
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{{ "\n" }}
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
# 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
|
||||||
@ -14,3 +13,4 @@
|
|||||||
retries: 30
|
retries: 30
|
||||||
networks:
|
networks:
|
||||||
- {{docker_compose_project_name}}_network
|
- {{docker_compose_project_name}}_network
|
||||||
|
{{ "\n" }}
|
Loading…
Reference in New Issue
Block a user