Skip to content

Commit

Permalink
Change fix cat cmd for docker compose files in Init-actions (#866)
Browse files Browse the repository at this point in the history
  • Loading branch information
vkumra-broad authored Apr 16, 2019
1 parent 8f374b4 commit 5701dc7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/main/resources/jupyter/init-actions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,16 @@ if [[ "${ROLE}" == 'Master' ]]; then
# Note the `docker-compose pull` is retried to avoid intermittent network errors, but
# `docker-compose up` is not retried.
COMPOSE_FILES=(-f /etc/`basename ${PROXY_DOCKER_COMPOSE}`)
cat /etc/`basename ${PROXY_DOCKER_COMPOSE}`
if [ ! -z ${JUPYTER_DOCKER_IMAGE} ] ; then
COMPOSE_FILES+=(-f /etc/`basename ${JUPYTER_DOCKER_COMPOSE}`)
cat /etc/`basename ${JUPYTER_DOCKER_COMPOSE}`
fi
if [ ! -z ${RSTUDIO_DOCKER_IMAGE} ] ; then
COMPOSE_FILES+=(-f /etc/`basename ${RSTUDIO_DOCKER_COMPOSE}`)
cat /etc/`basename ${RSTUDIO_DOCKER_COMPOSE}`
fi

cat "${COMPOSE_FILES[@]}"

retry 5 docker-compose "${COMPOSE_FILES[@]}" config
retry 5 docker-compose "${COMPOSE_FILES[@]}" pull
retry 5 docker-compose "${COMPOSE_FILES[@]}" up -d
Expand Down

0 comments on commit 5701dc7

Please sign in to comment.