mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2024-11-22 04:31:13 +01:00
Renamed templates
This commit is contained in:
parent
ecb9ad0809
commit
dc218769c4
@ -17,11 +17,10 @@ services:
|
|||||||
- env/run.env
|
- env/run.env
|
||||||
environment:
|
environment:
|
||||||
- AKAUNTING_SETUP
|
- AKAUNTING_SETUP
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
|
|
||||||
{% include 'templates/docker-networks-for-role.yml.j2' %}
|
{% include 'templates/docker-compose-networks.yml.j2' %}
|
@ -7,20 +7,20 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- .:/usr/share/nginx/html
|
- .:/usr/share/nginx/html
|
||||||
- .:/var/www
|
- .:/var/www
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
maildev:
|
maildev:
|
||||||
redis:
|
redis:
|
||||||
worker:
|
worker:
|
||||||
env_file:
|
env_file:
|
||||||
- ./.env
|
- ./.env
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
worker:
|
worker:
|
||||||
image: attendize_worker:latest
|
image: attendize_worker:latest
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
maildev:
|
maildev:
|
||||||
redis:
|
redis:
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
volumes:
|
volumes:
|
||||||
- .:/usr/share/nginx/html
|
- .:/usr/share/nginx/html
|
||||||
- .:/var/www
|
- .:/var/www
|
||||||
@ -31,13 +31,12 @@ services:
|
|||||||
image: maildev/maildev
|
image: maildev/maildev
|
||||||
ports:
|
ports:
|
||||||
- "{{ mail_interface_http_port }}:1080"
|
- "{{ mail_interface_http_port }}:1080"
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
{% include 'templates/docker-depends-on-central-database.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:
|
redis:
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
|
|
||||||
{% include 'templates/docker-networks-for-role.yml.j2' %}
|
{% include 'templates/docker-compose-networks.yml.j2' %}
|
@ -12,16 +12,15 @@ services:
|
|||||||
- data:/baserow/data
|
- data:/baserow/data
|
||||||
ports:
|
ports:
|
||||||
- "{{http_port}}:80"
|
- "{{http_port}}:80"
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
{% include 'templates/docker-depends-on-central-database.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' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
redis:
|
redis:
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
|
|
||||||
{% include 'templates/docker-networks-for-role.yml.j2' %}
|
{% include 'templates/docker-compose-networks.yml.j2' %}
|
@ -2,7 +2,7 @@ version: "3"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-redis-service.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
env_file: .env
|
env_file: .env
|
||||||
|
|
||||||
@ -10,7 +10,7 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
|
image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
|
||||||
depends_on:
|
depends_on:
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
- redis
|
- redis
|
||||||
env_file: .env
|
env_file: .env
|
||||||
command: celery -A funkwhale_api.taskapp worker -l INFO --concurrency=${CELERYD_CONCURRENCY-0}
|
command: celery -A funkwhale_api.taskapp worker -l INFO --concurrency=${CELERYD_CONCURRENCY-0}
|
||||||
@ -18,24 +18,24 @@ services:
|
|||||||
- C_FORCE_ROOT=true
|
- C_FORCE_ROOT=true
|
||||||
volumes:
|
volumes:
|
||||||
- "data:${MEDIA_ROOT}"
|
- "data:${MEDIA_ROOT}"
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
|
|
||||||
celerybeat:
|
celerybeat:
|
||||||
restart: always
|
restart: always
|
||||||
image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
|
image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
|
||||||
depends_on:
|
depends_on:
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
- redis
|
- redis
|
||||||
env_file: .env
|
env_file: .env
|
||||||
command: celery -A funkwhale_api.taskapp beat --pidfile= -l INFO
|
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:
|
api:
|
||||||
restart: always
|
restart: always
|
||||||
image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
|
image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
|
||||||
depends_on:
|
depends_on:
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
- redis
|
- redis
|
||||||
env_file: .env
|
env_file: .env
|
||||||
volumes:
|
volumes:
|
||||||
@ -43,7 +43,7 @@ services:
|
|||||||
#- "${STATIC_ROOT}:${STATIC_ROOT}"
|
#- "${STATIC_ROOT}:${STATIC_ROOT}"
|
||||||
ports:
|
ports:
|
||||||
- "5000"
|
- "5000"
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
front:
|
front:
|
||||||
restart: always
|
restart: always
|
||||||
@ -61,13 +61,12 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
# override those variables in your .env file if needed
|
# override those variables in your .env file if needed
|
||||||
- "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80"
|
- "${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' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
redis:
|
redis:
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
|
|
||||||
{% include 'templates/docker-networks-for-role.yml.j2' %}
|
{% include 'templates/docker-compose-networks.yml.j2' %}
|
@ -27,11 +27,10 @@ services:
|
|||||||
- data:/data
|
- data:/data
|
||||||
- /etc/timezone:/etc/timezone:ro
|
- /etc/timezone:/etc/timezone:ro
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
|
|
||||||
{% include 'templates/docker-networks-for-role.yml.j2' %}
|
{% include 'templates/docker-compose-networks.yml.j2' %}
|
@ -39,13 +39,12 @@ services:
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
redis:
|
redis:
|
||||||
|
|
||||||
{% include 'templates/docker-redis-service.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
redis:
|
redis:
|
||||||
config:
|
config:
|
||||||
logs:
|
logs:
|
||||||
data:
|
data:
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
|
@ -11,20 +11,19 @@ services:
|
|||||||
JOOMLA_DB_PASSWORD: "{{database_password}}"
|
JOOMLA_DB_PASSWORD: "{{database_password}}"
|
||||||
JOOMLA_DB_NAME: "{{database_databasename}}"
|
JOOMLA_DB_NAME: "{{database_databasename}}"
|
||||||
restart: always
|
restart: always
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
volumes:
|
volumes:
|
||||||
- data:/var/www/html
|
- data:/var/www/html
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:{{http_port}}:80"
|
- "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 %}
|
{% if enable_central_database %}
|
||||||
depends_on:
|
depends_on:
|
||||||
database:
|
database:
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
|
|
||||||
{% include 'templates/docker-networks-for-role.yml.j2' %}
|
{% include 'templates/docker-compose-networks.yml.j2' %}
|
||||||
|
@ -11,9 +11,9 @@ services:
|
|||||||
- TZ=Etc/UTC
|
- TZ=Etc/UTC
|
||||||
volumes:
|
volumes:
|
||||||
- ./config.toml:/listmonk/config.toml
|
- ./config.toml:/listmonk/config.toml
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.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' %}
|
@ -2,7 +2,7 @@ version: '2.2'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-redis-service.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
|
|
||||||
@ -46,7 +46,7 @@ services:
|
|||||||
database:
|
database:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
default:
|
default:
|
||||||
webmail:
|
webmail:
|
||||||
radicale:
|
radicale:
|
||||||
@ -64,12 +64,12 @@ services:
|
|||||||
resolver:
|
resolver:
|
||||||
front:
|
front:
|
||||||
redis:
|
redis:
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
logging:
|
logging:
|
||||||
driver: journald
|
driver: journald
|
||||||
dns:
|
dns:
|
||||||
- 192.168.203.254
|
- 192.168.203.254
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
imap:
|
imap:
|
||||||
image: ghcr.io/mailu/dovecot:{{version_mailu}}
|
image: ghcr.io/mailu/dovecot:{{version_mailu}}
|
||||||
@ -85,7 +85,7 @@ services:
|
|||||||
- 192.168.203.254
|
- 192.168.203.254
|
||||||
logging:
|
logging:
|
||||||
driver: journald
|
driver: journald
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
smtp:
|
smtp:
|
||||||
image: ghcr.io/mailu/postfix:{{version_mailu}}
|
image: ghcr.io/mailu/postfix:{{version_mailu}}
|
||||||
@ -101,7 +101,7 @@ services:
|
|||||||
- 192.168.203.254
|
- 192.168.203.254
|
||||||
logging:
|
logging:
|
||||||
driver: journald
|
driver: journald
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
oletools:
|
oletools:
|
||||||
image: ghcr.io/mailu/oletools:{{version_mailu}}
|
image: ghcr.io/mailu/oletools:{{version_mailu}}
|
||||||
@ -111,7 +111,7 @@ services:
|
|||||||
- resolver
|
- resolver
|
||||||
dns:
|
dns:
|
||||||
- 192.168.203.254
|
- 192.168.203.254
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
noinet:
|
noinet:
|
||||||
|
|
||||||
antispam:
|
antispam:
|
||||||
@ -131,7 +131,7 @@ services:
|
|||||||
- 192.168.203.254
|
- 192.168.203.254
|
||||||
logging:
|
logging:
|
||||||
driver: journald
|
driver: journald
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
default:
|
default:
|
||||||
noinet:
|
noinet:
|
||||||
|
|
||||||
@ -149,7 +149,7 @@ services:
|
|||||||
- 192.168.203.254
|
- 192.168.203.254
|
||||||
logging:
|
logging:
|
||||||
driver: journald
|
driver: journald
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
webdav:
|
webdav:
|
||||||
image: ghcr.io/mailu/radicale:{{version_mailu}}
|
image: ghcr.io/mailu/radicale:{{version_mailu}}
|
||||||
@ -165,7 +165,7 @@ services:
|
|||||||
- resolver
|
- resolver
|
||||||
dns:
|
dns:
|
||||||
- 192.168.203.254
|
- 192.168.203.254
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
fetchmail:
|
fetchmail:
|
||||||
image: ghcr.io/mailu/fetchmail:{{version_mailu}}
|
image: ghcr.io/mailu/fetchmail:{{version_mailu}}
|
||||||
@ -182,7 +182,7 @@ services:
|
|||||||
- resolver
|
- resolver
|
||||||
dns:
|
dns:
|
||||||
- 192.168.203.254
|
- 192.168.203.254
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
webmail:
|
webmail:
|
||||||
image: ghcr.io/mailu/webmail:{{version_mailu}}
|
image: ghcr.io/mailu/webmail:{{version_mailu}}
|
||||||
@ -199,11 +199,11 @@ services:
|
|||||||
driver: journald
|
driver: journald
|
||||||
dns:
|
dns:
|
||||||
- 192.168.203.254
|
- 192.168.203.254
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
webmail:
|
webmail:
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
smtp_queue:
|
smtp_queue:
|
||||||
admin_data:
|
admin_data:
|
||||||
webdav_data:
|
webdav_data:
|
||||||
@ -213,7 +213,7 @@ volumes:
|
|||||||
dovecot_mail:
|
dovecot_mail:
|
||||||
redis:
|
redis:
|
||||||
|
|
||||||
{% include 'templates/docker-networks-for-role.yml.j2' %}
|
{% include 'templates/docker-compose-networks.yml.j2' %}
|
||||||
default:
|
default:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
ipam:
|
ipam:
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
{% include 'templates/docker-redis-service.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
|
|
||||||
@ -15,14 +15,14 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:{{http_port}}:3000"
|
- "127.0.0.1:{{http_port}}:3000"
|
||||||
depends_on:
|
depends_on:
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
redis:
|
redis:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
volumes:
|
volumes:
|
||||||
- data:/mastodon/public/system
|
- data:/mastodon/public/system
|
||||||
logging:
|
logging:
|
||||||
driver: journald
|
driver: journald
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
streaming:
|
streaming:
|
||||||
image: tootsuite/mastodon:{{version_mastodon}}
|
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']
|
test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:{{stream_port}}:4000"
|
- "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:
|
redis:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
logging:
|
logging:
|
||||||
driver: journald
|
driver: journald
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
sidekiq:
|
sidekiq:
|
||||||
image: tootsuite/mastodon:{{version_mastodon}}
|
image: tootsuite/mastodon:{{version_mastodon}}
|
||||||
@ -46,7 +46,7 @@ services:
|
|||||||
env_file: .env.production
|
env_file: .env.production
|
||||||
command: bundle exec sidekiq
|
command: bundle exec sidekiq
|
||||||
depends_on:
|
depends_on:
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
redis:
|
redis:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
volumes:
|
volumes:
|
||||||
@ -55,11 +55,10 @@ services:
|
|||||||
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
|
||||||
logging:
|
logging:
|
||||||
driver: journald
|
driver: journald
|
||||||
{% include 'templates/docker-networks-for-container.yml.j2' %}
|
{% include 'templates/docker-container-networks.yml.j2' %}
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
redis:
|
redis:
|
||||||
data:
|
data:
|
||||||
|
|
||||||
{% include 'templates/docker-networks-for-role.yml.j2' %}
|
{% include 'templates/docker-compose-networks.yml.j2' %}
|
@ -22,6 +22,6 @@ services:
|
|||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
volumes:
|
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
|
@ -59,8 +59,7 @@ services:
|
|||||||
# volumes:
|
# volumes:
|
||||||
# - instagram_bridge_data:/data
|
# - instagram_bridge_data:/data
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
synapse_data:
|
synapse_data:
|
||||||
#telegram_bridge_data:
|
#telegram_bridge_data:
|
||||||
#whatsapp_bridge_data:
|
#whatsapp_bridge_data:
|
||||||
|
@ -28,6 +28,5 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
data:
|
data:
|
@ -34,7 +34,7 @@ services:
|
|||||||
volumes_from:
|
volumes_from:
|
||||||
- application
|
- application
|
||||||
|
|
||||||
{% include 'templates/docker-redis-service.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
|
image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
|
||||||
@ -44,9 +44,9 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- data:/var/www/html
|
- data:/var/www/html
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
redis:
|
redis:
|
||||||
volumes:
|
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
data:
|
data:
|
||||||
redis:
|
redis:
|
||||||
|
@ -4,8 +4,7 @@ networks:
|
|||||||
frontend:
|
frontend:
|
||||||
backend:
|
backend:
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
data:
|
data:
|
||||||
|
|
||||||
x-op-restart-policy: &restart_policy
|
x-op-restart-policy: &restart_policy
|
||||||
@ -68,7 +67,7 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- frontend
|
- frontend
|
||||||
- backend
|
- backend
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
cache:
|
cache:
|
||||||
seeder:
|
seeder:
|
||||||
labels:
|
labels:
|
||||||
@ -94,7 +93,7 @@ services:
|
|||||||
command: "./docker/prod/worker"
|
command: "./docker/prod/worker"
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
cache:
|
cache:
|
||||||
seeder:
|
seeder:
|
||||||
|
|
||||||
@ -103,7 +102,7 @@ services:
|
|||||||
command: "./docker/prod/cron"
|
command: "./docker/prod/cron"
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
cache:
|
cache:
|
||||||
seeder:
|
seeder:
|
||||||
|
|
||||||
|
@ -21,13 +21,13 @@ services:
|
|||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% include 'templates/docker-redis-service.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
volumes:
|
|
||||||
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
assets:
|
assets:
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
data:
|
data:
|
||||||
redis:
|
redis:
|
||||||
config:
|
config:
|
@ -4,7 +4,7 @@ services:
|
|||||||
|
|
||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
|
|
||||||
{% include 'templates/docker-redis-service.yml.j2' %}
|
{% include 'templates/docker-service-redis.yml.j2' %}
|
||||||
|
|
||||||
application:
|
application:
|
||||||
image: zknt/pixelfed
|
image: zknt/pixelfed
|
||||||
@ -19,7 +19,7 @@ services:
|
|||||||
- "./env:/var/www/.env"
|
- "./env:/var/www/.env"
|
||||||
ports:
|
ports:
|
||||||
- "{{http_port}}:80"
|
- "{{http_port}}:80"
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
redis:
|
redis:
|
||||||
worker:
|
worker:
|
||||||
image: zknt/pixelfed
|
image: zknt/pixelfed
|
||||||
@ -38,12 +38,11 @@ services:
|
|||||||
interval: 60s
|
interval: 60s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 1
|
retries: 1
|
||||||
{% include 'templates/docker-depends-on-central-database.yml.j2' %}
|
{% include 'templates/docker-container-depends-on.yml.j2' %}
|
||||||
redis:
|
redis:
|
||||||
application:
|
application:
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
redis:
|
redis:
|
||||||
application_data:
|
application_data:
|
||||||
bootstrap:
|
bootstrap:
|
@ -24,6 +24,5 @@ services:
|
|||||||
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
volumes:
|
{% include 'templates/docker-compose-volumes.yml.j2' %}
|
||||||
{% include 'templates/docker-database-volume.yml.j2' %}
|
|
||||||
data:
|
data:
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
volumes:
|
||||||
{% if not enable_central_database %}
|
{% if not enable_central_database %}
|
||||||
database:
|
database:
|
||||||
{% endif %}
|
{% endif %}
|
Loading…
Reference in New Issue
Block a user