diff --git a/inst/testing/nemo1/mynemo-docker-dind b/inst/testing/nemo1/mynemo-docker-dind index 5f36c8ef52917f62410b3a3daf641cf59fe4d363..8986f900af2a53f7c0ee2633cb86c3cdad2cb15a 100755 --- a/inst/testing/nemo1/mynemo-docker-dind +++ b/inst/testing/nemo1/mynemo-docker-dind @@ -69,9 +69,11 @@ fi ## -docker_outer__image_name="nemo-all1" -docker_outer__container_name="nemo-all1" -docker_outer_volume_forinnerdockerdir="dind1" +docker_outer__image_name="nemo-all2" +docker_outer__container_name="nemo-all2" +docker_outer_volume_forinnerdockerdir="dind2" + +docker_log_prefix="_1" # has to be consistent with docker_outer__container_name? # @@ -201,7 +203,7 @@ elif [ "$1" = "--docker-build" ]; then #arg ## echo "# starting new debian-docker-in-docker container:" 1>&2 - (set -x; docker run -d --privileged --volume "$SSH_AUTH_SOCK:/ssh-auth-sock" --volume dind2:/var/lib/docker/ --hostname "$docker_outer_hostname" --name "$docker_outer__container_name" -t -p 8001:443 "$docker_outer__image_name") + (set -x; docker run -d --privileged --volume "$SSH_AUTH_SOCK:/ssh-auth-sock" --volume "$docker_outer_volume_forinnerdockerdir:/var/lib/docker/" --hostname "$docker_outer_hostname" --name "$docker_outer__container_name" -t -p 8000:443 "$docker_outer__image_name") #(set -x; docker run -d --privileged --net dind-mgmt --net nemo-flow-input --volume "$SSH_AUTH_SOCK:/ssh-auth-sock" --volume "$docker_outer_volume_forinnerdockerdir:/var/lib/docker/" --hostname "$docker_outer_hostname" --name "$docker_outer__container_name" -t -p 8000:443 "$docker_outer__image_name") #(set -x; docker run -d --privileged --net dind-mgmt --volume "$SSH_AUTH_SOCK:/ssh-auth-sock" --volume "$docker_outer_volume_forinnerdockerdir:/var/lib/docker/" --hostname "$docker_outer_hostname" --name "$docker_outer__container_name" -t -p 8000:443 "$docker_outer__image_name") docker network connect "$network1_name" "$docker_outer__container_name" @@ -410,17 +412,17 @@ elif [ "$1" = "--docker.containerids" ]; then #arg elif [ "$1" = "--logs0" -o "$1" = "--get-nemo-logs0" ]; then #arg # get nemo_fishtank-nginx_1 logs shift 1 - echo "# inside debian-docker-in-docker container: docker logs nemo_fishtank-nginx_1 :" 1>&2 + echo "# inside debian-docker-in-docker container: docker logs nemo_fishtank-nginx$docker_log_postfix :" 1>&2 #(set -x; docker exec -ti "$docker_outer__container_name" docker logs nemo_fishtank-nginx_1) - (set -x; docker exec "$docker_outer__container_name" docker logs nemo_fishtank-nginx_1) + (set -x; docker exec "$docker_outer__container_name" docker logs "nemo_fishtank-nginx$docker_log_postfix") echo 1>&2 elif [ "$1" = "--logs1" -o "$1" = "--get-nemo-logs1" ]; then #arg # get nemo_fishtank_1 logs shift 1 - echo "# inside debian-docker-in-docker container: docker logs nemo_fishtank_1 :" 1>&2 - #(set -x; docker exec -ti "$docker_outer__container_name" docker logs nemo_fishtank_1) - (set -x; docker exec "$docker_outer__container_name" docker logs nemo_fishtank_1) + echo "# inside debian-docker-in-docker container: docker logs nemo_fishtank$docker_log_postfix :" 1>&2 + #(set -x; docker exec -ti "$docker_outer__container_name" docker logs "nemo_fishtank$docker_log_postfix") + (set -x; docker exec "$docker_outer__container_name" docker logs "nemo_fishtank$docker_log_postfix") echo 1>&2 elif [ "$1" = "--logsall" -o "$1" = "--get-nemo-logsall" ]; then #arg # get all nemo_*logs