kopia lustrzana https://github.com/OpenDroneMap/WebODM
Removed timeouts from wait-for-it, set worker to wait for webapp
rodzic
b5f98ae5ae
commit
303ab6fbb6
|
@ -1,6 +1,6 @@
|
||||||
version: '2.1'
|
version: '2.1'
|
||||||
services:
|
services:
|
||||||
webapp:
|
webapp:
|
||||||
entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh broker:6379 -- /webodm/start.sh --create-default-pnode --setup-devenv\""
|
entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh -t 0 broker:6379 -- /webodm/start.sh --create-default-pnode --setup-devenv\""
|
||||||
volumes:
|
volumes:
|
||||||
- .:/webodm
|
- .:/webodm
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
version: '2.1'
|
version: '2.1'
|
||||||
services:
|
services:
|
||||||
webapp:
|
webapp:
|
||||||
entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh broker:6379 -- /webodm/start.sh --create-default-pnode\""
|
entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh -t 0 broker:6379 -- /webodm/start.sh --create-default-pnode\""
|
||||||
depends_on:
|
depends_on:
|
||||||
- node-odm-1
|
- node-odm-1
|
||||||
node-odm-1:
|
node-odm-1:
|
||||||
|
|
|
@ -17,7 +17,7 @@ services:
|
||||||
webapp:
|
webapp:
|
||||||
image: opendronemap/webodm_webapp
|
image: opendronemap/webodm_webapp
|
||||||
container_name: webapp
|
container_name: webapp
|
||||||
entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh broker:6379 -- /webodm/start.sh\""
|
entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh -t 0 broker:6379 -- /webodm/start.sh\""
|
||||||
volumes:
|
volumes:
|
||||||
- ${WO_MEDIA_DIR}:/webodm/app/media
|
- ${WO_MEDIA_DIR}:/webodm/app/media
|
||||||
ports:
|
ports:
|
||||||
|
@ -41,7 +41,7 @@ services:
|
||||||
worker:
|
worker:
|
||||||
image: opendronemap/webodm_webapp
|
image: opendronemap/webodm_webapp
|
||||||
container_name: worker
|
container_name: worker
|
||||||
entrypoint: /bin/bash -c "/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh broker:6379 -- /webodm/worker.sh start"
|
entrypoint: /bin/bash -c "/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh -t 0 broker:6379 -- /webodm/wait-for-it.sh -t 0 webapp:8000 -- /webodm/worker.sh start"
|
||||||
volumes:
|
volumes:
|
||||||
- ${WO_MEDIA_DIR}:/webodm/app/media
|
- ${WO_MEDIA_DIR}:/webodm/app/media
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 1b3b33df63ce1423988dfb68969e827d27de9035
|
Subproject commit 12f8807b038da9d4fdd292ae73679571631663c4
|
Ładowanie…
Reference in New Issue