diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index a9f1268..398b37c 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -39,7 +39,7 @@ EOF # PACKAGES enabled ths with apt-get update && apt-get $APTPARAM install -y openssh-server $PACKAGES in in RUN export DEBIAN_FRONTEND=noninteractive APTPARAM=" --no-install-recommends " IMAGE_local="microservice-jupyter26" -HYBRID_NETWORK="swarmlab-jupyter26" +HYBRID_NETWORK="microservice-jupyter26" # dont edit IMAGE_origin="hub.swarmlab.io:5480/swarmlab-service-juscipy-ondemand" #IMAGE_origin="registry.vlabs.uniwa.gr:5080/swarmlab-service-juscipy-ondemand" @@ -101,6 +101,11 @@ fi create_dockerfile () { + docker pull $IMAGE_origin << ANSWERS +yes +yes +yes +ANSWERS . $Wdir/ROOT_PASSWORD if [ -d "$Wdir/project" ]; then # ----------------------------------------------- @@ -178,6 +183,11 @@ fi create_project () { + docker pull $IMAGE_origin << ANSWERS +yes +yes +yes +ANSWERS if [ "$Wdir" == "$HOME" ]; then echo"" @@ -459,8 +469,13 @@ up_master () printf "\\n%s\\n" "$HEADER" echo "$ docker-compose up -d masterservice" printf "\\n" - docker-compose rm -f - docker-compose up --build --force-recreate -d masterservice + docker-compose rm -f -s -v + #docker-compose up --build --force-recreate -d masterservice + docker-compose up --build --remove-orphans --force-recreate -d masterservice << ANSWERS +yes +yes +yes +ANSWERS #docker-compose up --force-recreate -d masterservice }