Skip to content

Commit

Permalink
Install GUI tools into dever stage
Browse files Browse the repository at this point in the history
  • Loading branch information
ruffsl committed Jul 9, 2024
1 parent 00fdbc8 commit 39ca865
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
10 changes: 8 additions & 2 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
< /tmp/rosdep_build_debs.txt xargs apt-get install -y --no-install-recommends

# install packages for build work
COPY .docker/tooler_apt_deps.txt /tmp/tooler_apt_deps.txt
COPY .docker/tooler_apt_debs.txt /tmp/tooler_apt_debs.txt
RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
cut -d# -f1 < /tmp/tooler_apt_deps.txt | envsubst \
cut -d# -f1 < /tmp/tooler_apt_debs.txt | envsubst \
| xargs apt-get install -y --no-install-recommends

# setup default ccache configuration
Expand Down Expand Up @@ -220,6 +220,12 @@ RUN --mount=type=cache,id=$WS_CACHE_ID,sharing=private,target=$OVERLAY_WS \
################################################################################
FROM $DEV_FROM_STAGE AS dever

# install packages for development work
COPY .docker/dever_apt_debs.txt /tmp/dever_apt_debs.txt
RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
cut -d# -f1 < /tmp/dever_apt_debs.txt | envsubst \
| xargs apt-get install -y --no-install-recommends

# add default user for devcontainer
ENV DEV_USER=ubuntu
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
Expand Down
4 changes: 4 additions & 0 deletions .docker/dever_apt_debs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# ROS tools
ros-${ROS_DISTRO}-rqt-common-plugins
ros-${ROS_DISTRO}-rviz-common
ros-${ROS_DISTRO}-rviz2
3 changes: 0 additions & 3 deletions .docker/tooler_apt_deps.txt → .docker/tooler_apt_debs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,3 @@ nano
unzip
valgrind
yadm

# ROS tools
ros-${ROS_DISTRO}-rqt-common-plugins

0 comments on commit 39ca865

Please sign in to comment.