Skip to content

Commit

Permalink
implement hardware rendering (fixes space-ros#159)
Browse files Browse the repository at this point in the history
Signed-off-by: dirksavage88 <[email protected]>
  • Loading branch information
dirksavage88 committed Sep 6, 2024
1 parent ad020b8 commit aa003b8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions space_robots/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ARG DEBIAN_FRONTEND=noninteractive
# the cache won't make it into the built image but will be maintained between steps.
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
sudo apt-get update -y && sudo apt-get install -y python3-rosinstall-generator
sudo apt-get update -y && sudo apt-get install -y python3-rosinstall-generator libgl1-mesa-glx libgl1-mesa-dri

# TODO(anyone): remove demo-pkgs.txt, no packages left after exclusions
# Generate repos file for demo dependencies, excluding packages from Space ROS core.
Expand Down Expand Up @@ -83,7 +83,7 @@ RUN cd mongo-cxx-driver-r3.6.7/build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCM
# Get the source for the dependencies
# RUN vcs import src < /tmp/demo_generated_pkgs.repos
COPY --chown=${USERNAME}:${USERNAME} demo_manual_pkgs.repos /tmp/
RUN vcs import src < /tmp/demo_manual_pkgs.repos && /bin/bash -c 'source "${SPACEROS_DIR}/install/setup.bash"'
RUN vcs import src < /tmp/demo_manual_pkgs.repos && /bin/bash -c 'source "${SPACEROS_DIR}/install/setup.bash"'

RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
Expand Down
2 changes: 2 additions & 0 deletions space_robots/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ CONTAINER_NAME="$(tr '/' '_' <<< "$IMG_NAME")"

# Start the container
docker run --rm -it --name $CONTAINER_NAME --network host \
--volume=/tmp/.X11-unix:/tmp/.X11-unix\
--device=/dev/dri:/dev/dri \
-e DISPLAY -e TERM -e QT_X11_NO_MITSHM=1 $IMG_NAME

0 comments on commit aa003b8

Please sign in to comment.