diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 9f76b97e23d..8a18d81b9f4 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -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 @@ -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 diff --git a/.docker/dever_apt_debs.txt b/.docker/dever_apt_debs.txt new file mode 100644 index 00000000000..62103367bf6 --- /dev/null +++ b/.docker/dever_apt_debs.txt @@ -0,0 +1,4 @@ +# ROS tools +ros-${ROS_DISTRO}-rqt-common-plugins +ros-${ROS_DISTRO}-rviz-common +ros-${ROS_DISTRO}-rviz2 diff --git a/.docker/tooler_apt_deps.txt b/.docker/tooler_apt_debs.txt similarity index 70% rename from .docker/tooler_apt_deps.txt rename to .docker/tooler_apt_debs.txt index 6d73ae3f868..5d746b71d8f 100644 --- a/.docker/tooler_apt_deps.txt +++ b/.docker/tooler_apt_debs.txt @@ -12,6 +12,3 @@ nano unzip valgrind yadm - -# ROS tools -ros-${ROS_DISTRO}-rqt-common-plugins