Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
- ${REMOTE_DEBUGGING_PORT:-5678}:5678
command: >
bash -c "
wait-for-it -s postgres.local:5432 -t 60 &&
wait-for-it -s postgres.local:5432 -t ${WAIT_POSTGRES_TIMEOUT:-180} &&
./manage.py migrate &&
./manage.py create_superuser &&
./manage.py create_example_users &&
Expand All @@ -49,7 +49,7 @@ services:
image: adit_dev-default_worker:latest
command: >
bash -c "
wait-for-it -s postgres.local:5432 -t 60 &&
wait-for-it -s postgres.local:5432 -t ${WAIT_POSTGRES_TIMEOUT:-180} &&
./manage.py bg_worker -l debug -q default --autoreload
"

Expand All @@ -58,7 +58,7 @@ services:
image: adit_dev-dicom_worker:latest
command: >
bash -c "
wait-for-it -s postgres.local:5432 -t 60 &&
wait-for-it -s postgres.local:5432 -t ${WAIT_POSTGRES_TIMEOUT:-180} &&
./manage.py bg_worker -l debug -q dicom --autoreload
"

Expand All @@ -67,7 +67,7 @@ services:
image: adit_dev-mass_transfer_worker:latest
command: >
bash -c "
wait-for-it -s postgres.local:5432 -t 60 &&
wait-for-it -s postgres.local:5432 -t ${WAIT_POSTGRES_TIMEOUT:-180} &&
./manage.py bg_worker -l debug -q mass_transfer --autoreload
"

Expand Down
8 changes: 4 additions & 4 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
hostname: init.local
command: >
bash -c "
wait-for-it -s postgres.local:5432 -t 60 &&
wait-for-it -s postgres.local:5432 -t ${WAIT_POSTGRES_TIMEOUT:-180} &&
./manage.py migrate &&
./manage.py collectstatic --no-input &&
./manage.py create_superuser &&
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
<<: *default-app
command: >
bash -c "
wait-for-it -s postgres.local:5432 -t 60 &&
wait-for-it -s postgres.local:5432 -t ${WAIT_POSTGRES_TIMEOUT:-180} &&
./manage.py bg_worker -q default
"
deploy:
Expand All @@ -68,7 +68,7 @@ services:
<<: *default-app
command: >
bash -c "
wait-for-it -s postgres.local:5432 -t 60 &&
wait-for-it -s postgres.local:5432 -t ${WAIT_POSTGRES_TIMEOUT:-180} &&
./manage.py bg_worker -q dicom
"
deploy:
Expand All @@ -79,7 +79,7 @@ services:
<<: *default-app
command: >
bash -c "
wait-for-it -s postgres.local:5432 -t 60 &&
wait-for-it -s postgres.local:5432 -t ${WAIT_POSTGRES_TIMEOUT:-180} &&
./manage.py bg_worker -q mass_transfer
"
deploy:
Expand Down
4 changes: 4 additions & 0 deletions example.env
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ SSL_SERVER_CHAIN_FILE=./chain.pem
# The timezone used by the server.
TIME_ZONE=Europe/Berlin

# Seconds the web and worker containers wait for Postgres to accept connections
# before giving up on startup.
WAIT_POSTGRES_TIMEOUT=180

# The calling AE title of ADIT.
CALLING_AE_TITLE=ADIT1DEV

Expand Down