diff --git a/build-provisioning.sh b/build-provisioning.sh index d62bec9..10f8c50 100755 --- a/build-provisioning.sh +++ b/build-provisioning.sh @@ -7,4 +7,4 @@ if [ $# -eq 0 ] fi docker build -t nubisware/nubisware-conductor-worker-py-provisioning:$tag -f docker/provisioning/Dockerfile . -#docker push nubisware/nubisware-conductor-worker-py-provisioning:$tag +docker push nubisware/nubisware-conductor-worker-py-provisioning:$tag diff --git a/docker/provisioning/Dockerfile b/docker/provisioning/Dockerfile index d6fd71c..fc88bfd 100644 --- a/docker/provisioning/Dockerfile +++ b/docker/provisioning/Dockerfile @@ -4,5 +4,5 @@ RUN pip install -r /app/requirements.txt RUN apt-get update RUN apt-get -y install packer WORKDIR /app -COPY ./docker/base/entrypoint.sh /app/ +COPY ./docker/provisioning/entrypoint.sh /app/ ENTRYPOINT ["/app/entrypoint.sh"] diff --git a/docker/provisioning/entrypoint.sh b/docker/provisioning/entrypoint.sh index 3c8eb8f..832068e 100755 --- a/docker/provisioning/entrypoint.sh +++ b/docker/provisioning/entrypoint.sh @@ -2,7 +2,7 @@ export BASE=${CONDUCTOR_SERVER:-http://conductorserver:8080/api} -echo 'Waiting for Conductor ...' +echo 'Waiting for Conductor at ' $BASE ' ...' while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' $BASE/health)" != 200 ]]; do echo 'still waiting ...'