Browse Source

pull

master
zeus 3 years ago
parent
commit
3b3fd6350a
  1. 15
      install/usr/share/swarmlab.io/sec/swarmlab-sec

15
install/usr/share/swarmlab.io/sec/swarmlab-sec

@ -37,7 +37,7 @@ EOF
# PACKAGES enabled ths with apt-get update && apt-get $APTPARAM install -y openssh-server $PACKAGES in in RUN export DEBIAN_FRONTEND=noninteractive # 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 " APTPARAM=" --no-install-recommends "
IMAGE_local="microservice-ubuntu" IMAGE_local="microservice-ubuntu"
HYBRID_NETWORK="swarmlab-ubuntu" HYBRID_NETWORK="microservice-ubuntu"
# dont edit # dont edit
#IMAGE_origin="hub.swarmlab.io:5480/hybrid-numpy:latest" #IMAGE_origin="hub.swarmlab.io:5480/hybrid-numpy:latest"
IMAGE_origin="hub.swarmlab.io:5480/hybrid-ubuntuslim:latest" IMAGE_origin="hub.swarmlab.io:5480/hybrid-ubuntuslim:latest"
@ -113,6 +113,12 @@ fi
create_dockerfile () create_dockerfile ()
{ {
docker pull $IMAGE_origin << ANSWERS
yes
yes
yes
ANSWERS
. $Wdir/ROOT_PASSWORD . $Wdir/ROOT_PASSWORD
if [ -d "$Wdir/project" ]; then if [ -d "$Wdir/project" ]; then
# ----------------------------------------------- # -----------------------------------------------
@ -187,6 +193,12 @@ fi
create_project () create_project ()
{ {
docker pull $IMAGE_origin << ANSWERS
yes
yes
yes
ANSWERS
if [ "$Wdir" == "$HOME" ]; then if [ "$Wdir" == "$HOME" ]; then
echo"" echo""
@ -469,7 +481,6 @@ up_master ()
# docker-compose up --build -d masterservice # docker-compose up --build -d masterservice
#docker-compose up --force-recreate -d masterservice #docker-compose up --force-recreate -d masterservice
docker-compose rm -f -s -v docker-compose rm -f -s -v
docker pull $IMAGE_origin
docker-compose up --build --remove-orphans -d masterservice << ANSWERS docker-compose up --build --remove-orphans -d masterservice << ANSWERS
yes yes
yes yes

Loading…
Cancel
Save