Renamed templates

This commit is contained in:
2024-01-02 21:39:17 +01:00
parent ab7ca07ac9
commit c863700dbf
26 changed files with 85 additions and 97 deletions

View File

@@ -1,7 +1,7 @@
version: '3'
services:
{% include 'templates/docker-redis-service.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
@@ -15,14 +15,14 @@ services:
ports:
- "127.0.0.1:{{http_port}}:3000"
depends_on:
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
redis:
condition: service_healthy
volumes:
- data:/mastodon/public/system
logging:
driver: journald
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
streaming:
image: tootsuite/mastodon:{{version_mastodon}}
@@ -33,12 +33,12 @@ services:
test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
ports:
- "127.0.0.1:{{stream_port}}:4000"
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
redis:
condition: service_healthy
logging:
driver: journald
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
sidekiq:
image: tootsuite/mastodon:{{version_mastodon}}
@@ -46,7 +46,7 @@ services:
env_file: .env.production
command: bundle exec sidekiq
depends_on:
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
redis:
condition: service_healthy
volumes:
@@ -55,11 +55,10 @@ services:
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
logging:
driver: journald
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
volumes:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
redis:
data:
{% include 'templates/docker-networks-for-role.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}