Renamed templates

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

View File

@ -17,11 +17,10 @@ services:
- env/run.env
environment:
- AKAUNTING_SETUP
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
volumes:
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-networks-for-role.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}

View File

@ -7,20 +7,20 @@ services:
volumes:
- .:/usr/share/nginx/html
- .:/var/www
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
maildev:
redis:
worker:
env_file:
- ./.env
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
worker:
image: attendize_worker:latest
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
maildev:
redis:
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
volumes:
- .:/usr/share/nginx/html
- .:/var/www
@ -31,13 +31,12 @@ services:
image: maildev/maildev
ports:
- "{{ mail_interface_http_port }}:1080"
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
{% include 'templates/docker-redis-service.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}
volumes:
{% include 'templates/docker-compose-volumes.yml.j2' %}
redis:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-networks-for-role.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}

View File

@ -12,16 +12,15 @@ services:
- data:/baserow/data
ports:
- "{{http_port}}:80"
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
{% include 'templates/docker-redis-service.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
volumes:
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:
redis:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-networks-for-role.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}

View File

@ -2,7 +2,7 @@ version: "3"
services:
{% include 'templates/docker-redis-service.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}
env_file: .env
@ -10,7 +10,7 @@ services:
restart: always
image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
depends_on:
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
- redis
env_file: .env
command: celery -A funkwhale_api.taskapp worker -l INFO --concurrency=${CELERYD_CONCURRENCY-0}
@ -18,24 +18,24 @@ services:
- C_FORCE_ROOT=true
volumes:
- "data:${MEDIA_ROOT}"
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
celerybeat:
restart: always
image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
depends_on:
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
- redis
env_file: .env
command: celery -A funkwhale_api.taskapp beat --pidfile= -l INFO
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
api:
restart: always
image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
depends_on:
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
- redis
env_file: .env
volumes:
@ -43,7 +43,7 @@ services:
#- "${STATIC_ROOT}:${STATIC_ROOT}"
ports:
- "5000"
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
front:
restart: always
@ -61,13 +61,12 @@ services:
ports:
# override those variables in your .env file if needed
- "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80"
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
volumes:
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:
redis:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-networks-for-role.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}

View File

@ -27,11 +27,10 @@ services:
- data:/data
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
volumes:
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-networks-for-role.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}

View File

@ -39,13 +39,12 @@ services:
{% endif %}
redis:
{% include 'templates/docker-redis-service.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
volumes:
{% include 'templates/docker-compose-volumes.yml.j2' %}
redis:
config:
logs:
data:
{% include 'templates/docker-database-volume.yml.j2' %}

View File

@ -11,20 +11,19 @@ services:
JOOMLA_DB_PASSWORD: "{{database_password}}"
JOOMLA_DB_NAME: "{{database_databasename}}"
restart: always
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
volumes:
- data:/var/www/html
ports:
- "127.0.0.1:{{http_port}}:80"
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
{% if enable_central_database %}
depends_on:
database:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
volumes:
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-networks-for-role.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}

View File

@ -11,9 +11,9 @@ services:
- TZ=Etc/UTC
volumes:
- ./config.toml:/listmonk/config.toml
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% 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-networks-for-role.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}

View File

@ -2,7 +2,7 @@ version: '2.2'
services:
{% include 'templates/docker-redis-service.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
@ -46,7 +46,7 @@ services:
database:
condition: service_healthy
{% endif %}
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
default:
webmail:
radicale:
@ -64,12 +64,12 @@ services:
resolver:
front:
redis:
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
logging:
driver: journald
dns:
- 192.168.203.254
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
imap:
image: ghcr.io/mailu/dovecot:{{version_mailu}}
@ -85,7 +85,7 @@ services:
- 192.168.203.254
logging:
driver: journald
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
smtp:
image: ghcr.io/mailu/postfix:{{version_mailu}}
@ -101,7 +101,7 @@ services:
- 192.168.203.254
logging:
driver: journald
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
oletools:
image: ghcr.io/mailu/oletools:{{version_mailu}}
@ -111,7 +111,7 @@ services:
- resolver
dns:
- 192.168.203.254
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
noinet:
antispam:
@ -131,7 +131,7 @@ services:
- 192.168.203.254
logging:
driver: journald
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
default:
noinet:
@ -149,7 +149,7 @@ services:
- 192.168.203.254
logging:
driver: journald
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
webdav:
image: ghcr.io/mailu/radicale:{{version_mailu}}
@ -165,7 +165,7 @@ services:
- resolver
dns:
- 192.168.203.254
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
fetchmail:
image: ghcr.io/mailu/fetchmail:{{version_mailu}}
@ -182,7 +182,7 @@ services:
- resolver
dns:
- 192.168.203.254
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
webmail:
image: ghcr.io/mailu/webmail:{{version_mailu}}
@ -199,11 +199,11 @@ services:
driver: journald
dns:
- 192.168.203.254
{% include 'templates/docker-networks-for-container.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
webmail:
volumes:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
smtp_queue:
admin_data:
webdav_data:
@ -213,7 +213,7 @@ volumes:
dovecot_mail:
redis:
{% include 'templates/docker-networks-for-role.yml.j2' %}
{% include 'templates/docker-compose-networks.yml.j2' %}
default:
driver: bridge
ipam:

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' %}

View File

@ -22,6 +22,6 @@ services:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% endif %}
volumes:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:

View File

@ -59,8 +59,7 @@ services:
# volumes:
# - instagram_bridge_data:/data
volumes:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
synapse_data:
#telegram_bridge_data:
#whatsapp_bridge_data:

View File

@ -28,6 +28,5 @@ services:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
volumes:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:

View File

@ -34,7 +34,7 @@ services:
volumes_from:
- application
{% include 'templates/docker-redis-service.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}
cron:
image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
@ -44,9 +44,9 @@ services:
volumes:
- data:/var/www/html
entrypoint: /cron.sh
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
redis:
volumes:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:
redis:

View File

@ -4,8 +4,7 @@ networks:
frontend:
backend:
volumes:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:
x-op-restart-policy: &restart_policy
@ -68,7 +67,7 @@ services:
networks:
- frontend
- backend
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
cache:
seeder:
labels:
@ -94,7 +93,7 @@ services:
command: "./docker/prod/worker"
networks:
- backend
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
cache:
seeder:
@ -103,7 +102,7 @@ services:
command: "./docker/prod/cron"
networks:
- backend
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
cache:
seeder:

View File

@ -21,13 +21,13 @@ services:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% endif %}
{% include 'templates/docker-redis-service.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}
env_file:
- .env
volumes:
{% include 'templates/docker-compose-volumes.yml.j2' %}
assets:
{% include 'templates/docker-database-volume.yml.j2' %}
data:
redis:
config:

View File

@ -4,7 +4,7 @@ services:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% include 'templates/docker-redis-service.yml.j2' %}
{% include 'templates/docker-service-redis.yml.j2' %}
application:
image: zknt/pixelfed
@ -19,7 +19,7 @@ services:
- "./env:/var/www/.env"
ports:
- "{{http_port}}:80"
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
redis:
worker:
image: zknt/pixelfed
@ -38,12 +38,11 @@ services:
interval: 60s
timeout: 5s
retries: 1
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
{% include 'templates/docker-container-depends-on.yml.j2' %}
redis:
application:
volumes:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
redis:
application_data:
bootstrap:

View File

@ -24,6 +24,5 @@ services:
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
{% endif %}
volumes:
{% include 'templates/docker-database-volume.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
data:

View File

@ -1,3 +1,4 @@
volumes:
{% if not enable_central_database %}
database:
{% endif %}