diff --git a/inst/testing/nemo1/mynemo-docker-dind b/inst/testing/nemo1/mynemo-docker-dind index 29ce1625e238646e5f54f5847fedf774fa875b85..5f36c8ef52917f62410b3a3daf641cf59fe4d363 100755 --- a/inst/testing/nemo1/mynemo-docker-dind +++ b/inst/testing/nemo1/mynemo-docker-dind @@ -64,13 +64,18 @@ fi #xarg ./mynemo-docker-dind --freertr-host2-ping-host1 # enter host2 container and run ping host1 #xarg ./mynemo-docker-dind --freertr-tshark-netconf # enter freertr container and run tshark on eth3, in order to monitor netconf traffic towards nemo container #xarg ./mynemo-docker-dind --nemo-tshark-netconf # enter (outer) nemo d-in-d container and run tshark on eth1, in order to monitor netconf traffic from freertr container -#xarg ./mynemo-docker-dind --nemo-get-filename-of-cerfile # show filename of client certificate filename (as seen from outside of outer nemo d-in-d container) +#xarg ./mynemo-docker-dind --nemo-get-filename-of-certfile # show filename of client certificate filename (as seen from outside of outer nemo d-in-d container) +#xarg ./mynemo-docker-dind --nemo-get-dirname-onhost # show dirname of inside container dir /nemo-all/ as seen from outside on the host ## -docker_outer__docker_file_name="Dockerfile-nemo-all" docker_outer__image_name="nemo-all1" docker_outer__container_name="nemo-all1" +docker_outer_volume_forinnerdockerdir="dind1" + +# + +docker_outer__docker_file_name="Dockerfile-nemo-all" docker_outer_hostname="localhost" @@ -164,18 +169,18 @@ elif [ "$1" = "--docker-build" ]; then #arg ## #echo "# starting new debian-docker-in-docker container:" 1>&2 - #docker_outer__container_name="$(set -x; docker run --privileged --volume "$SSH_AUTH_SOCK:/ssh-auth-sock" --volume dind1:/var/lib/docker/ --hostname "$docker_outer_hostname" --name "$docker_outer__container_name" -t -p 8000:443 "$docker_outer__image_name" sh -c "ls -l /nemo-all; tree -d /nemo-all/")" + #docker_outer__container_name="$(set -x; docker run --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" sh -c "ls -l /nemo-all; tree -d /nemo-all/")" #echo "docker_outer__image_name=$docker_outer__image_name" 1>&2 #echo 1>&2 #exit - #echo "# pruning outer volume dind1:" 1>&2 - #(set -x; docker volume rm dind1) + #echo "# pruning outer volume $docker_outer_volume_forinnerdockerdir:" 1>&2 + #(set -x; docker volume rm "$docker_outer_volume_forinnerdockerdir") outer_docker_space_dir="$(docker info | grep "Docker Root Dir:" | awk '{ print $(NF); }')" echo "# pruning inner containers before inner docker daemon is started (outer_docker_space_dir=$outer_docker_space_dir):" 1>&2 #(set -x; rm -rf /var/lib/docker/volumes/dind1/_data/containers/*) - (set -x; rm -rf "$outer_docker_space_dir/volumes/dind1/_data/containers/"*) || true + (set -x; rm -rf "$outer_docker_space_dir/volumes/$docker_outer_volume_forinnerdockerdir/_data/containers/"*) || true echo 1>&2 ## @@ -196,9 +201,9 @@ 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 dind1:/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 dind1:/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 dind1:/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 --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 --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" echo 1>&2 @@ -520,11 +525,17 @@ elif [ "$1" = "--nemo-tshark-netconf" ]; then #arg # enter (outer) nemo d-in-d c exec docker exec -ti "$docker_outer__container_name" tshark -T text -V -f 'port 9995' -d udp.port==9995,cflow -i eth1 -elif [ "$1" = "--nemo-get-filename-of-cerfile" ]; then #arg # show filename of client certificate filename (as seen from outside of outer nemo d-in-d container) +elif [ "$1" = "--nemo-get-filename-of-certfile" ]; then #arg # show filename of client certificate filename (as seen from outside of outer nemo d-in-d container) shift 1 echo "/proc/$(docker inspect "$docker_outer__container_name" | awk ' /"Pid":/ { sub(/,$/, ""); print $2; }')/root/nemo-all/secrets/CA/admin.p12" +elif [ "$1" = "--nemo-get-dirname-onhost" ]; then #arg # show dirname of inside container dir /nemo-all/ as seen from outside on the host + shift 1 + + echo "/proc/$(docker inspect "$docker_outer__container_name" | awk ' /"Pid":/ { sub(/,$/, ""); print $2; }')/root/nemo-all/" + + #arg else