EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 8e04577d authored by Fabian Schindler's avatar Fabian Schindler
Browse files

Instance setup waiting

Adding wait script to wait until an instance was set up
Adding startup scripts to wait
Using new EOxServer env configs
parent 1db74429
No related branches found
No related tags found
No related merge requests found
......@@ -68,7 +68,8 @@ ENV INSTANCE_ID="prism-view-server_core" \
REDIS_PORT= \
REDIS_REGISTER_QUEUE_KEY= \
REDIS_REGISTERED_SET_KEY= \
INIT_SCRIPTS="/configure.sh"
INIT_SCRIPTS="/configure.sh" \
COLLECT_STATIC="false"
ADD rgbnir_definition.json \
configure.sh \
......@@ -76,6 +77,8 @@ ADD rgbnir_definition.json \
run-registrar.sh \
registrar.py \
entrypoint.sh \
wait-initialized.sh \
initialized.sh \
/
# run-redis-manager.sh \
......@@ -85,7 +88,9 @@ RUN chmod -v +x \
/configure.sh \
/run-registrar.sh \
/run-httpd.sh \
/entrypoint.sh
/entrypoint.sh \
/wait-initialized.sh \
/initialized.sh
# /run-redis-manager.sh
EXPOSE 80
......
#!/bin/bash -e
touch "${INSTANCE_DIR}/.initialized"
echo "Instance ${INSTANCE_ID} is initialized"
#!/bin/bash -e
until [ -f "${INSTANCE_DIR}/.initialized" ] ; do
echo "Waiting until instance ${INSTANCE_ID} is initialized"
sleep 3
# TODO: timeout?
done
......@@ -42,7 +42,9 @@ services:
environment:
INSTANCE_ID: "prism-view-server_renderer"
INSTALL_DIR: "/var/www/pvs/dev/"
INIT_SCRIPTS: "/configure.sh /init-db.sh"
COLLECT_STATIC: "false"
INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
STARTUP_SCRIPTS: "/wait-initialized.sh"
WAIT_SERVICES: "database:5432"
configs:
- source: init-db
......@@ -131,9 +133,10 @@ services:
INSTALL_DIR: "/var/www/pvs/dev/"
SCALEFACTOR: "1"
IN_MEMORY: "false"
INIT_SCRIPTS: "/configure.sh /init-db.sh"
WAIT_SERVICES: "redis:6379 database:5432 renderer:80"
WAIT_TIMEOUT: 300 # wait up to 5 minutes
COLLECT_STATIC: "false"
INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
STARTUP_SCRIPTS: "/wait-initialized.sh"
WAIT_SERVICES: "redis:6379 database:5432"
configs:
- source: init-db
target: /init-db.sh
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment