nethost cmd add

hrjp · Mar 6, 2024 · c0d186e · c0d186e
1 parent 69405b1
commit c0d186e
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 267 deletions.
diff --git a/README.md b/README.md
@@ -56,9 +56,6 @@ git clone https://github.com/hrjp/rosenv
 # Ubuntu 20.04
 ./rosenv/docker/ubuntu20/run.bash
 
-# YOLO v5
-./rosenv/docker/yolo5/run.bash
-
 # YOLOX with ROS1 noetic
 ./rosenv/docker/ubuntu20/run.bash
 
@@ -73,6 +70,7 @@ git clone https://github.com/hrjp/rosenv
 | :--- | :--- | :--- |
 | -g | | GPUを使用する |
 | -r | | コンテナからexitした際にコンテナを自動消去する | 
+| -w | | --net-host をつけないで実行する(コンテナ外とネットワークを分離する) |
 | -n CONTAINER_NAME | | コンテナの名前 |
 | -s SHARE_FOLDER_PATH | | コンテナ内部と共有するディレクトリのパス<br>rosbagをやデータを外部と共有する際に使用<br>(ex.　shareフォルダを作ってから　/home/$USER/share ) |
 

diff --git a/docker/naviton_melodic/run.bash b/docker/naviton_melodic/run.bash
@@ -6,6 +6,7 @@ SHARE_FOLDER_PATH=""
 SHARE_FOLDER_CMD=""
 GPU_CMD=""
 CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
+NETHOST_CMD="--net=host"
 
 usage_exit() {
         echo " " 1>&2
@@ -20,7 +21,7 @@ usage_exit() {
         exit 1
 }
 
-while getopts grn:s:h OPT
+while getopts grwn:s:h OPT
 do
     case $OPT in
         g )  GPU_CMD="--gpus all"
@@ -30,6 +31,9 @@ do
             CONTAINER_NAME_CMD=""
             echo " Remove when exit this container" 1>&2
             ;;
+        w )  NETHOST_CMD=""
+            echo " Not using --net=host" 1>&2
+            ;;
         n)  CONTAINER_NAME=$OPTARG
             CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
             echo " CONTAINER_NAME = $OPTARG " 1>&2
@@ -69,7 +73,6 @@ docker run -it  $CONTAINER_NAME_CMD\
             -e QT_X11_NO_MITSHM=1 \
             $GPU_CMD \
             $REMOVE_CMD \
-            --net=host \
+            $NETHOST_CMD \
             --privileged \
-            $IMAGE_NAME /bin/bash
-
+            $IMAGE_NAME /bin/bash
diff --git a/docker/ros2_foxy/Dockerfile b/docker/ros2_foxy/Dockerfile
@@ -42,7 +42,7 @@ ARG ros2_ver=foxy
 ENV ROS_DISTRO=$ros2_ver
 
 #Indtall ROS2(Foxy etc..) and Install Tool for ROS2 and setup script の自動実行 and Install turtlesim and gazebo and Install ros2_example and turtulebot3_gazebo(waffle or burger)
-RUN apt install -y ros-$ROS_DISTRO-desktop ros-$ROS_DISTRO-turtlesim ros-$ROS_DISTRO-gazebo-ros-pkgs \
+RUN apt install -y ros-$ROS_DISTRO-desktop-full ros-$ROS_DISTRO-turtlesim ros-$ROS_DISTRO-gazebo-ros-pkgs \
 	python3-rosdep python3-argcomplete python3-colcon-common-extensions && \
 	echo "ros installed" && \
     rosdep init && \

diff --git a/docker/ros2_foxy/run.bash b/docker/ros2_foxy/run.bash
@@ -6,6 +6,7 @@ SHARE_FOLDER_PATH=""
 SHARE_FOLDER_CMD=""
 GPU_CMD=""
 CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
+NETHOST_CMD="--net=host"
 
 usage_exit() {
         echo " " 1>&2
@@ -20,7 +21,7 @@ usage_exit() {
         exit 1
 }
 
-while getopts grn:s:h OPT
+while getopts grwn:s:h OPT
 do
     case $OPT in
         g )  GPU_CMD="--gpus all"
@@ -30,6 +31,9 @@ do
             CONTAINER_NAME_CMD=""
             echo " Remove when exit this container" 1>&2
             ;;
+        w )  NETHOST_CMD=""
+            echo " Not using --net=host" 1>&2
+            ;;
         n)  CONTAINER_NAME=$OPTARG
             CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
             echo " CONTAINER_NAME = $OPTARG " 1>&2
@@ -69,7 +73,6 @@ docker run -it  $CONTAINER_NAME_CMD\
             -e QT_X11_NO_MITSHM=1 \
             $GPU_CMD \
             $REMOVE_CMD \
-            --net=host \
+            $NETHOST_CMD \
             --privileged \
-            $IMAGE_NAME /bin/bash
-
+            $IMAGE_NAME /bin/bash
diff --git a/docker/ros2_galactic/Dockerfile b/docker/ros2_galactic/Dockerfile
@@ -36,7 +36,7 @@ ARG ros2_ver=galactic
 ENV ROS_DISTRO=$ros2_ver
 
 #Indtall ROS2(Foxy etc..) and Install Tool for ROS2 and setup script の自動実行 and Install turtlesim and gazebo and Install ros2_example and turtulebot3_gazebo(waffle or burger)
-RUN apt install -y ros-$ROS_DISTRO-desktop ros-$ROS_DISTRO-turtlesim ros-$ROS_DISTRO-gazebo-ros-pkgs \
+RUN apt install -y ros-$ROS_DISTRO-desktop-full ros-$ROS_DISTRO-turtlesim ros-$ROS_DISTRO-gazebo-ros-pkgs \
 	python3-rosdep python3-argcomplete python3-colcon-common-extensions && \
 	apt install -y python3-vcstool && \
 	echo "ros installed" && \

diff --git a/docker/ros2_galactic/run.bash b/docker/ros2_galactic/run.bash
@@ -6,6 +6,7 @@ SHARE_FOLDER_PATH=""
 SHARE_FOLDER_CMD=""
 GPU_CMD=""
 CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
+NETHOST_CMD="--net=host"
 
 usage_exit() {
         echo " " 1>&2
@@ -20,7 +21,7 @@ usage_exit() {
         exit 1
 }
 
-while getopts grn:s:h OPT
+while getopts grwn:s:h OPT
 do
     case $OPT in
         g )  GPU_CMD="--gpus all"
@@ -30,6 +31,9 @@ do
             CONTAINER_NAME_CMD=""
             echo " Remove when exit this container" 1>&2
             ;;
+        w )  NETHOST_CMD=""
+            echo " Not using --net=host" 1>&2
+            ;;
         n)  CONTAINER_NAME=$OPTARG
             CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
             echo " CONTAINER_NAME = $OPTARG " 1>&2
@@ -69,7 +73,6 @@ docker run -it  $CONTAINER_NAME_CMD\
             -e QT_X11_NO_MITSHM=1 \
             $GPU_CMD \
             $REMOVE_CMD \
-            --net=host \
+            $NETHOST_CMD \
             --privileged \
-            $IMAGE_NAME /bin/bash
-
+            $IMAGE_NAME /bin/bash
diff --git a/docker/ros2_galactic/run_without_nethost.bash b/docker/ros2_galactic/run_without_nethost.bash
diff --git a/docker/ros2_humble/run.bash b/docker/ros2_humble/run.bash
@@ -6,6 +6,7 @@ SHARE_FOLDER_PATH=""
 SHARE_FOLDER_CMD=""
 GPU_CMD=""
 CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
+NETHOST_CMD="--net=host"
 
 usage_exit() {
         echo " " 1>&2
@@ -20,7 +21,7 @@ usage_exit() {
         exit 1
 }
 
-while getopts grn:s:h OPT
+while getopts grwn:s:h OPT
 do
     case $OPT in
         g )  GPU_CMD="--gpus all"
@@ -30,6 +31,9 @@ do
             CONTAINER_NAME_CMD=""
             echo " Remove when exit this container" 1>&2
             ;;
+        w )  NETHOST_CMD=""
+            echo " Not using --net=host" 1>&2
+            ;;
         n)  CONTAINER_NAME=$OPTARG
             CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
             echo " CONTAINER_NAME = $OPTARG " 1>&2
@@ -69,7 +73,7 @@ docker run -it  $CONTAINER_NAME_CMD\
             -e QT_X11_NO_MITSHM=1 \
             $GPU_CMD \
             $REMOVE_CMD \
-            --net=host \
+            $NETHOST_CMD \
             --privileged \
             $IMAGE_NAME /bin/bash
 
diff --git a/docker/ros2_humble/run_without_nethost.bash b/docker/ros2_humble/run_without_nethost.bash
diff --git a/docker/ros_melodic/run.bash b/docker/ros_melodic/run.bash
@@ -6,6 +6,7 @@ SHARE_FOLDER_PATH=""
 SHARE_FOLDER_CMD=""
 GPU_CMD=""
 CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
+NETHOST_CMD="--net=host"
 
 usage_exit() {
         echo " " 1>&2
@@ -20,7 +21,7 @@ usage_exit() {
         exit 1
 }
 
-while getopts grn:s:h OPT
+while getopts grwn:s:h OPT
 do
     case $OPT in
         g )  GPU_CMD="--gpus all"
@@ -30,6 +31,9 @@ do
             CONTAINER_NAME_CMD=""
             echo " Remove when exit this container" 1>&2
             ;;
+        w )  NETHOST_CMD=""
+            echo " Not using --net=host" 1>&2
+            ;;
         n)  CONTAINER_NAME=$OPTARG
             CONTAINER_NAME_CMD="--name $CONTAINER_NAME"
             echo " CONTAINER_NAME = $OPTARG " 1>&2
@@ -69,7 +73,6 @@ docker run -it  $CONTAINER_NAME_CMD\
             -e QT_X11_NO_MITSHM=1 \
             $GPU_CMD \
             $REMOVE_CMD \
-            --net=host \
+            $NETHOST_CMD \
             --privileged \
-            $IMAGE_NAME /bin/bash
-
+            $IMAGE_NAME /bin/bash