|
|
@ -277,23 +277,23 @@ services: |
|
|
|
- $Wdir/project:/home/docker/project |
|
|
|
|
|
|
|
|
|
|
|
workerservice: |
|
|
|
image: $IMAGE_NAME |
|
|
|
privileged: true |
|
|
|
environment: |
|
|
|
- NODENAME=${NODENAME} |
|
|
|
- NODENETWORK=${NODENETWORK} |
|
|
|
- DISPLAY=\${DISPLAY} |
|
|
|
cap_add: |
|
|
|
- NET_ADMIN |
|
|
|
user: root |
|
|
|
entrypoint: ["sec_bootstrap", "role=workerservice", "sec_master_service_name=masterservice", "sec_worker_service_name=workerservice"] |
|
|
|
#ports: |
|
|
|
# - "\${SSH_PORT}:22" |
|
|
|
networks: |
|
|
|
- ${HYBRID_NETWORK} |
|
|
|
volumes: |
|
|
|
- $Wdir/project:/home/docker/project |
|
|
|
# workerservice: |
|
|
|
# image: $IMAGE_NAME |
|
|
|
# privileged: true |
|
|
|
# environment: |
|
|
|
# - NODENAME=${NODENAME} |
|
|
|
# - NODENETWORK=${NODENETWORK} |
|
|
|
# - DISPLAY=\${DISPLAY} |
|
|
|
# cap_add: |
|
|
|
# - NET_ADMIN |
|
|
|
# user: root |
|
|
|
# entrypoint: ["sec_bootstrap", "role=workerservice", "sec_master_service_name=masterservice", "sec_worker_service_name=workerservice"] |
|
|
|
# #ports: |
|
|
|
# # - "\${SSH_PORT}:22" |
|
|
|
# networks: |
|
|
|
# - ${HYBRID_NETWORK} |
|
|
|
# volumes: |
|
|
|
# - $Wdir/project:/home/docker/project |
|
|
|
|
|
|
|
networks: |
|
|
|
${HYBRID_NETWORK}: |
|
|
@ -465,9 +465,18 @@ up_master () |
|
|
|
printf "\\n%s\\n" "$HEADER" |
|
|
|
echo "$ docker-compose up -d masterservice" |
|
|
|
printf "\\n" |
|
|
|
docker-compose rm -f |
|
|
|
docker-compose up --build -d masterservice |
|
|
|
#docker-compose rm -f |
|
|
|
#docker-compose up --build -d masterservice |
|
|
|
#docker-compose up --force-recreate -d masterservice |
|
|
|
|
|
|
|
docker-compose rm -f -s -v |
|
|
|
docker pull $IMAGE_NAME |
|
|
|
docker-compose up --build --remove-orphans -d masterservice << ANSWERS |
|
|
|
yes |
|
|
|
yes |
|
|
|
yes |
|
|
|
ANSWERS |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -646,7 +655,7 @@ if [ $COMMAND_UP -eq 1 ]; then |
|
|
|
generate_ssh_keys |
|
|
|
build_and_push_image # remove for microservices |
|
|
|
up_master |
|
|
|
up_workers |
|
|
|
#up_workers |
|
|
|
|
|
|
|
prompt_ready |
|
|
|
show_instruction |
|
|
@ -667,7 +676,7 @@ elif [ $COMMAND_SCALE -eq 1 ]; then |
|
|
|
down_master |
|
|
|
down_workers |
|
|
|
up_master |
|
|
|
up_workers |
|
|
|
#up_workers |
|
|
|
|
|
|
|
prompt_ready |
|
|
|
show_instruction |
|
|
@ -678,7 +687,7 @@ elif [ $COMMAND_RELOAD -eq 1 ]; then |
|
|
|
down_workers |
|
|
|
build_and_push_image |
|
|
|
up_master |
|
|
|
up_workers |
|
|
|
#up_workers |
|
|
|
|
|
|
|
prompt_ready |
|
|
|
show_instruction |
|
|
|