From e9179b19bc31e52038351b5ef930bc6d99f1504d Mon Sep 17 00:00:00 2001 From: Woensug Choi Date: Fri, 13 Aug 2021 13:39:02 +0900 Subject: [PATCH 1/8] cuda-dev flag --- run.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run.bash b/run.bash index 66823f2..5a3a156 100755 --- a/run.bash +++ b/run.bash @@ -49,12 +49,12 @@ ROCKER_ARGS="--devices $JOY --dev-helpers --nvidia --x11 --user --home --git" while getopts ":csth" option; do case $option in c) # enable cuda library support - CUDA="--cuda ";; + CUDA="--cuda-dev ";; s) # Build cloudsim image - ROCKER_ARGS="--cuda --nvidia --novnc --turbovnc --user --user-override-name=developer";; + ROCKER_ARGS="--cuda-dev --nvidia --novnc --turbovnc --user --user-override-name=developer";; t) # Build test image for Continuous Integration echo "Building CI image" - ROCKER_ARGS="--cuda --dev-helpers --nvidia --user --user-override-name=developer";; + ROCKER_ARGS="--cuda-dev --dev-helpers --nvidia --user --user-override-name=developer";; h) # print this help message and exit Help exit;; From 4ed313368e5895d4e5e2a2cbfe405f828e028852 Mon Sep 17 00:00:00 2001 From: Woensug Choi Date: Fri, 13 Aug 2021 13:52:45 +0900 Subject: [PATCH 2/8] fix conflicts --- run.bash | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/run.bash b/run.bash index 5a3a156..e199d32 100755 --- a/run.bash +++ b/run.bash @@ -48,16 +48,16 @@ ROCKER_ARGS="--devices $JOY --dev-helpers --nvidia --x11 --user --home --git" while getopts ":csth" option; do case $option in - c) # enable cuda library support + c) # enable cuda library support CUDA="--cuda-dev ";; s) # Build cloudsim image - ROCKER_ARGS="--cuda-dev --nvidia --novnc --turbovnc --user --user-override-name=developer";; - t) # Build test image for Continuous Integration + ROCKER_ARGS="--nvidia --novnc --turbovnc --user --user-override-name=developer";; + t) # Build test image for Continuous Integration echo "Building CI image" - ROCKER_ARGS="--cuda-dev --dev-helpers --nvidia --user --user-override-name=developer";; + ROCKER_ARGS="--dev-helpers --nvidia --user --user-override-name=developer";; h) # print this help message and exit Help - exit;; + exit;; esac done @@ -69,4 +69,4 @@ CONTAINER_NAME="${NAMES[0]}_runtime" ROCKER_ARGS="${ROCKER_ARGS} --name $CONTAINER_NAME" echo "Using image <$IMG_NAME> to start container <$CONTAINER_NAME>" -rocker ${CUDA} ${ROCKER_ARGS} $IMG_NAME +rocker ${CUDA} ${ROCKER_ARGS} $IMG_NAME From 3b4299d1078bc062716c40027997d65ddab4c4d8 Mon Sep 17 00:00:00 2001 From: Woensug Choi Date: Fri, 13 Aug 2021 13:39:02 +0900 Subject: [PATCH 3/8] cuda-dev flag --- run.bash | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/run.bash b/run.bash index 79d873e..e199d32 100755 --- a/run.bash +++ b/run.bash @@ -48,16 +48,16 @@ ROCKER_ARGS="--devices $JOY --dev-helpers --nvidia --x11 --user --home --git" while getopts ":csth" option; do case $option in - c) # enable cuda library support - CUDA="--cuda ";; + c) # enable cuda library support + CUDA="--cuda-dev ";; s) # Build cloudsim image ROCKER_ARGS="--nvidia --novnc --turbovnc --user --user-override-name=developer";; - t) # Build test image for Continuous Integration + t) # Build test image for Continuous Integration echo "Building CI image" ROCKER_ARGS="--dev-helpers --nvidia --user --user-override-name=developer";; h) # print this help message and exit Help - exit;; + exit;; esac done @@ -69,4 +69,4 @@ CONTAINER_NAME="${NAMES[0]}_runtime" ROCKER_ARGS="${ROCKER_ARGS} --name $CONTAINER_NAME" echo "Using image <$IMG_NAME> to start container <$CONTAINER_NAME>" -rocker ${CUDA} ${ROCKER_ARGS} $IMG_NAME +rocker ${CUDA} ${ROCKER_ARGS} $IMG_NAME From 98723ed687b8e23a95c8f629d7b2bd232ff138b2 Mon Sep 17 00:00:00 2001 From: Woensug Choi Date: Fri, 25 Feb 2022 15:49:35 +0900 Subject: [PATCH 4/8] additional apt packages for GPURay version --- kinetic/Dockerfile | 7 +++++-- melodic/Dockerfile | 4 +++- noetic/Dockerfile | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/kinetic/Dockerfile b/kinetic/Dockerfile index 1eb89cb..5f24569 100644 --- a/kinetic/Dockerfile +++ b/kinetic/Dockerfile @@ -9,7 +9,7 @@ ARG DIST=kinetic # Set Gazebo verison ARG GAZ=gazebo7 -# Required utilities +# Required utilities RUN apt update \ && apt install -y --no-install-recommends \ build-essential \ @@ -82,15 +82,18 @@ RUN /bin/sh -c 'echo "deb http://packages.ros.org/ros/ubuntu ${RELEASE} main" > ros-${DIST}-velodyne-gazebo-plugins \ ros-${DIST}-velodyne-simulator \ ros-${DIST}-xacro \ + ros-${DIST}-pcl-ros \ + ros-${DIST}-image-view \ && apt clean -RUN apt install -y --no-install-recommends python3-numpy +RUN apt install -y --no-install-recommends python3-numpy # Optional: Dev. tools, applications, etc. RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ psmisc \ vim \ + x11-apps \ && rm -rf /var/lib/apt/lists/* ## Customize your image here. diff --git a/melodic/Dockerfile b/melodic/Dockerfile index 0d359c8..cf7c378 100644 --- a/melodic/Dockerfile +++ b/melodic/Dockerfile @@ -9,7 +9,7 @@ ARG DIST=melodic # Set Gazebo verison ARG GAZ=gazebo9 -# Required utilities +# Required utilities RUN apt update \ && apt install -y --no-install-recommends \ build-essential \ @@ -82,6 +82,8 @@ RUN /bin/sh -c 'echo "deb http://packages.ros.org/ros/ubuntu ${RELEASE} main" > ros-${DIST}-velodyne-gazebo-plugins \ ros-${DIST}-velodyne-simulator \ ros-${DIST}-xacro \ + ros-${DIST}-pcl-ros \ + ros-${DIST}-image-view \ && apt clean RUN pip3 install numpy diff --git a/noetic/Dockerfile b/noetic/Dockerfile index 7697c1f..684268c 100644 --- a/noetic/Dockerfile +++ b/noetic/Dockerfile @@ -86,8 +86,13 @@ RUN /bin/sh -c 'echo "deb http://packages.ros.org/ros/ubuntu ${RELEASE} main" > ros-${DIST}-velodyne-gazebo-plugins \ ros-${DIST}-velodyne-simulator \ ros-${DIST}-xacro \ + ros-${DIST}-pcl-ros \ + ros-${DIST}-image-view \ && apt clean +# Fix rqt_image_viewer pyqt5 problem +RUN python3 -m pip remove pyqt5 pyqt5-sip + # Optional: Dev. tools, applications, etc. RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ From 81f71d1847b33f6f28a22734fbb42058ec996e01 Mon Sep 17 00:00:00 2001 From: Woensug Choi Date: Mon, 9 May 2022 16:42:22 +0900 Subject: [PATCH 5/8] update to use new commands --- noetic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noetic/Dockerfile b/noetic/Dockerfile index 684268c..19bf23c 100644 --- a/noetic/Dockerfile +++ b/noetic/Dockerfile @@ -91,7 +91,7 @@ RUN /bin/sh -c 'echo "deb http://packages.ros.org/ros/ubuntu ${RELEASE} main" > && apt clean # Fix rqt_image_viewer pyqt5 problem -RUN python3 -m pip remove pyqt5 pyqt5-sip +RUN python3 -m pip uninstall pyqt5 pyqt5-sip # Optional: Dev. tools, applications, etc. RUN apt-get update && apt-get install -y --no-install-recommends \ From 4b84f31f139e4a3389ece60ee6aebe7713b3255b Mon Sep 17 00:00:00 2001 From: Woensug Choi Date: Mon, 9 May 2022 17:07:15 +0900 Subject: [PATCH 6/8] add roslint --- noetic/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/noetic/Dockerfile b/noetic/Dockerfile index 19bf23c..112a825 100644 --- a/noetic/Dockerfile +++ b/noetic/Dockerfile @@ -56,6 +56,7 @@ RUN /bin/sh -c 'echo "deb http://packages.ros.org/ros/ubuntu ${RELEASE} main" > python3-rosinstall \ python3-rosinstall-generator \ python3-vcstool \ + catkin-lint \ ros-${DIST}-gazebo-plugins \ ros-${DIST}-gazebo-ros \ ros-${DIST}-gazebo-ros-control \ From e7761491143a7e1ccd39745973c011919730a0cf Mon Sep 17 00:00:00 2001 From: Woensug Choi Date: Wed, 20 Jul 2022 10:39:16 +0900 Subject: [PATCH 7/8] change cuda-dev flag to cuda https://github.com/osrf/rocker/pull/126 --- run.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.bash b/run.bash index e199d32..6c0f56f 100755 --- a/run.bash +++ b/run.bash @@ -49,7 +49,7 @@ ROCKER_ARGS="--devices $JOY --dev-helpers --nvidia --x11 --user --home --git" while getopts ":csth" option; do case $option in c) # enable cuda library support - CUDA="--cuda-dev ";; + CUDA="--cuda";; s) # Build cloudsim image ROCKER_ARGS="--nvidia --novnc --turbovnc --user --user-override-name=developer";; t) # Build test image for Continuous Integration From b625d6dc73ee42b62e0392a250d44727e1a6c4fb Mon Sep 17 00:00:00 2001 From: Woen-Sug Choi Date: Wed, 29 Nov 2023 16:54:58 +0900 Subject: [PATCH 8/8] fix X11 defualt argument --- run.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.bash b/run.bash index 09d3d96..90db137 100755 --- a/run.bash +++ b/run.bash @@ -45,7 +45,7 @@ Help() JOY=/dev/input/js0 CUDA="" -ROCKER_ARGS="--devices $JOY --dev-helpers --nvidia --x11 --user --home --git" +ROCKER_ARGS="--devices $JOY --dev-helpers --nvidia --x11 --volume /dev:/dev --user --home --git" while getopts ":cstxh" option; do case $option in