EOX GitLab Instance

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

Adding optional timeout parameter to service waiting

parent 1420653d
No related branches found
No related tags found
1 merge request!6Cache native swift
#!/bin/bash -e #!/bin/bash -e
SERVICES=${WAIT_SERVICES:=''} SERVICES=${WAIT_SERVICES:=''}
TIMEOUT=${WAIT_TIMEOUT:='15'}
if [[ ! -z $SERVICES ]] ; then if [[ ! -z $SERVICES ]] ; then
for service in $SERVICES ; do for service in $SERVICES ; do
wait-for-it $service wait-for-it -t $TIMEOUT $service
done done
fi fi
......
...@@ -42,7 +42,6 @@ RUN apt update && \ ...@@ -42,7 +42,6 @@ RUN apt update && \
apt clean && \ apt clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN pip3 install . && \ RUN pip3 install . && \
pip3 install python-keystoneclient python-swiftclient redis pip3 install python-keystoneclient python-swiftclient redis
...@@ -76,6 +75,7 @@ ADD rgbnir_definition.json \ ...@@ -76,6 +75,7 @@ ADD rgbnir_definition.json \
run-httpd.sh \ run-httpd.sh \
run-registrar.sh \ run-registrar.sh \
registrar.py \ registrar.py \
mapcache_items_view.sql \
entrypoint.sh \ entrypoint.sh \
/ /
......
#!/bin/bash -e #!/bin/bash -e
SERVICES=${WAIT_SERVICES:=''} SERVICES=${WAIT_SERVICES:=''}
TIMEOUT=${WAIT_TIMEOUT:='15'}
if [[ ! -z $SERVICES ]] ; then if [[ ! -z $SERVICES ]] ; then
for service in $SERVICES ; do for service in $SERVICES ; do
wait-for-it $service wait-for-it -t $TIMEOUT $service
done done
fi fi
......
#!/bin/bash -e #!/bin/bash -e
SERVICES=${WAIT_SERVICES:=''} SERVICES=${WAIT_SERVICES:=''}
TIMEOUT=${WAIT_TIMEOUT:='15'}
if [[ ! -z $SERVICES ]] ; then if [[ ! -z $SERVICES ]] ; then
for service in $SERVICES ; do for service in $SERVICES ; do
wait-for-it $service wait-for-it -t $TIMEOUT $service
done done
fi fi
......
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