ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Docker: Shorten server-db-setup service name

Browse Source
This commit is contained in:
Gernot Schulz 2020-08-14 15:35:37 +02:00 committed by Finn Stutzenstein
parent f694e9b2c4
commit 9c9f268fbf
No known key found for this signature in database
GPG Key ID: 9042F605C6324654
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/docker-compose.yml.m4
View File

@ -70,7 +70,7 @@ services:
# Uncomment the following line to use daphne instead of gunicorn: # Uncomment the following line to use daphne instead of gunicorn:
# command: "daphne -b 0.0.0.0 -p 8000 openslides.asgi:application" # command: "daphne -b 0.0.0.0 -p 8000 openslides.asgi:application"
depends_on: depends_on:
- server-db-setup - server-setup
environment: environment:
<< : *default-osserver-env << : *default-osserver-env
secrets: secrets:
@ -78,7 +78,7 @@ services:
ifelse(read_env(`OPENSLIDES_BACKEND_SERVICE_REPLICAS'),,,deploy: ifelse(read_env(`OPENSLIDES_BACKEND_SERVICE_REPLICAS'),,,deploy:
replicas: ifenvelse(`OPENSLIDES_BACKEND_SERVICE_REPLICAS', 1)) replicas: ifenvelse(`OPENSLIDES_BACKEND_SERVICE_REPLICAS', 1))
server-db-setup: server-setup:
<< : *default-osserver << : *default-osserver
entrypoint: /usr/local/sbin/entrypoint-db-setup entrypoint: /usr/local/sbin/entrypoint-db-setup
environment: environment:

2
docker/docker-stack.yml.m4
View File

@ -79,7 +79,7 @@ services:
delay: 5s delay: 5s
replicas: ifenvelse(`OPENSLIDES_BACKEND_SERVICE_REPLICAS', 1) replicas: ifenvelse(`OPENSLIDES_BACKEND_SERVICE_REPLICAS', 1)
server-db-setup: server-setup:
<< : *default-osserver << : *default-osserver
entrypoint: /usr/local/sbin/entrypoint-db-setup entrypoint: /usr/local/sbin/entrypoint-db-setup
environment: environment:

2
server/docker/entrypoint
View File

@ -12,7 +12,7 @@ source /run/secrets/django
export SECRET_KEY="$DJANGO_SECRET_KEY" export SECRET_KEY="$DJANGO_SECRET_KEY"
# TODO: env variable for this host # TODO: env variable for this host
wait-for-it -t 0 "server-db-setup:8000" wait-for-it -t 0 "server-setup:8000"
printf 'Executing server: "%s"\n' "$*" printf 'Executing server: "%s"\n' "$*"