Skip to content

Commit abf6552

Browse files
authored
Merge pull request #147 from mkhansenbot/remove_rocker
Remove rocker - fix issue #146
2 parents 0117735 + 1f85724 commit abf6552

File tree

6 files changed

+11
-39
lines changed

6 files changed

+11
-39
lines changed

moveit2/run.sh

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@
44
# Requires:
55
# docker
66
# an X server
7-
# rocker
8-
9-
10-
ROCKER_ARGS="--devices /dev/dri/ --dev-helpers --x11 --user-override-name spaceros-user --network host"
117

128
IMG_NAME=openrobotics/moveit2
139

1410
# Replace `/` with `_` to comply with docker container naming
1511
# And append `_runtime`
1612
CONTAINER_NAME="$(tr '/' '_' <<< "$IMG_NAME")"
17-
ROCKER_ARGS="${ROCKER_ARGS} --name $CONTAINER_NAME"
18-
echo "Using image <$IMG_NAME> to start container <$CONTAINER_NAME>"
1913

2014
# Start the container
21-
rocker ${ROCKER_ARGS} $IMG_NAME
15+
docker run --rm -it --name $CONTAINER_NAME --network host \
16+
-e DISPLAY -e TERM -e QT_X11_NO_MITSHM=1 $IMG_NAME

nav2_demo/run.sh

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@
44
# Requires:
55
# docker
66
# an X server
7-
# rocker
8-
9-
10-
ROCKER_ARGS="--devices /dev/dri/ --dev-helpers --x11 --user-override-name spaceros-user --network host"
117

128
IMG_NAME=osrf/space_nav2_demo
139

1410
# Replace `/` with `_` to comply with docker container naming
1511
# And append `_runtime`
1612
CONTAINER_NAME="$(tr '/' '_' <<< "$IMG_NAME")"
17-
ROCKER_ARGS="${ROCKER_ARGS} --name $CONTAINER_NAME"
18-
echo "Using image <$IMG_NAME> to start container <$CONTAINER_NAME>"
1913

2014
# Start the container
21-
rocker ${ROCKER_ARGS} $IMG_NAME
15+
docker run --rm -it --name $CONTAINER_NAME --network host \
16+
-e DISPLAY -e TERM -e QT_X11_NO_MITSHM=1 $IMG_NAME

navigation2/run.sh

+2-8
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,12 @@
44
# Requires:
55
# docker
66
# an X server
7-
# rocker
8-
9-
10-
ROCKER_ARGS="--devices /dev/dri/ --dev-helpers --x11 --user-override-name spaceros-user --network host"
117

128
IMG_NAME=osrf/space_nav2
13-
149
# Replace `/` with `_` to comply with docker container naming
1510
# And append `_runtime`
1611
CONTAINER_NAME="$(tr '/' '_' <<< "$IMG_NAME")"
17-
ROCKER_ARGS="${ROCKER_ARGS} --name $CONTAINER_NAME"
18-
echo "Using image <$IMG_NAME> to start container <$CONTAINER_NAME>"
1912

2013
# Start the container
21-
rocker ${ROCKER_ARGS} $IMG_NAME
14+
docker run --rm -it --name $CONTAINER_NAME --network host \
15+
-e DISPLAY -e TERM -e QT_X11_NO_MITSHM=1 $IMG_NAME

space_robots/run.sh

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@
44
# Requires:
55
# docker
66
# an X server
7-
# rocker
8-
9-
10-
ROCKER_ARGS="--devices /dev/dri/ --dev-helpers --x11 --user-override-name spaceros-user --network host"
117

128
IMG_NAME=openrobotics/space_robots_demo
139

1410
# Replace `/` with `_` to comply with docker container naming
1511
# And append `_runtime`
1612
CONTAINER_NAME="$(tr '/' '_' <<< "$IMG_NAME")"
17-
ROCKER_ARGS="${ROCKER_ARGS} --name $CONTAINER_NAME"
18-
echo "Using image <$IMG_NAME> to start container <$CONTAINER_NAME>"
1913

2014
# Start the container
21-
rocker ${ROCKER_ARGS} $IMG_NAME
15+
docker run --rm -it --name $CONTAINER_NAME --network host \
16+
-e DISPLAY -e TERM -e QT_X11_NO_MITSHM=1 $IMG_NAME

spaceros/README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Space ROS Docker Image and Earthly configuration
22

33
The Earthfile configuration in this directory facilitates builds of Space ROS from source code.
4-
The generated container image is based on Ubuntu 22.04 (Jammy) and can be used with [`rocker`](https://github.com/osrf/rocker) to add X11 and GPU passthrough.
4+
The generated container image is based on Ubuntu 22.04 (Jammy)
55

66
## Building the Docker Image
77

@@ -42,7 +42,6 @@ ubuntu jammy a8780b506fa4 5 days ago
4242

4343
The new image is named **osrf/space-ros:latest**.
4444

45-
The `rocker` library is required to run the built image, install it by `sudo apt-get install python3-rocker`.
4645
There is a run.sh script provided for convenience that will run the spaceros image in a container.
4746

4847
```bash

spaceros/run.sh

+2-8
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,12 @@
44
# Requires:
55
# docker
66
# an X server
7-
# rocker
8-
9-
10-
ROCKER_ARGS="--devices /dev/dri/ --dev-helpers --x11 --user-override-name spaceros-user --network host"
117

128
IMG_NAME=osrf/space-ros
13-
149
# Replace `/` with `_` to comply with docker container naming
1510
# And append `_runtime`
1611
CONTAINER_NAME="$(tr '/' '_' <<< "$IMG_NAME")"
17-
ROCKER_ARGS="${ROCKER_ARGS} --name $CONTAINER_NAME"
18-
echo "Using image <$IMG_NAME> to start container <$CONTAINER_NAME>"
1912

2013
# Start the container
21-
rocker ${ROCKER_ARGS} $IMG_NAME
14+
docker run --rm -it --name $CONTAINER_NAME --network host \
15+
-e DISPLAY -e TERM -e QT_X11_NO_MITSHM=1 $IMG_NAME

0 commit comments

Comments
 (0)