Skip to content

Commit d60163a

Browse files
committed
rosdep changes
1 parent d1806fc commit d60163a

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.devcontainer/nouveau/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.ke
2121

2222
RUN sudo apt-get -q update \
2323
&& sudo apt-get -q -y upgrade \
24-
&& rosdep update \
24+
&& rosdep update --include-eol-distros \
2525
&& rosdep install -y --from-paths . --ignore-src -r --rosdistro ${ROS_DISTRO} \
2626
&& sudo apt-get autoremove -y \
2727
&& sudo apt-get clean -y \

.devcontainer/nvidia/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.ke
2222

2323
RUN sudo apt-get -q update \
2424
&& sudo apt-get -q -y upgrade \
25-
&& rosdep update \
25+
&& rosdep update --include-eol-distros \
2626
&& rosdep install -y --from-paths . --ignore-src -r --rosdistro ${ROS_DISTRO} \
2727
&& sudo apt-get autoremove -y \
2828
&& sudo apt-get clean -y \

.docker/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG ROS_DISTRO=noetic
2-
FROM ros:$ROS_DISTRO-ros-base as ci
2+
FROM ros:$ROS_DISTRO-ros-base AS ci
33

44
ENV DEBIAN_FRONTEND=noninteractive
55
WORKDIR /root/ws_dock
@@ -39,14 +39,14 @@ RUN apt-get -q update \
3939
# Install all ROS dependencies needed for CI
4040
RUN apt-get -q update \
4141
&& apt-get -q -y upgrade \
42-
&& rosdep update \
42+
&& rosdep update --include-eol-distros \
4343
&& rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false \
4444
&& rm -rf src \
4545
&& apt-get autoremove -y \
4646
&& apt-get clean -y \
4747
&& rm -rf /var/lib/apt/lists/*
4848

49-
FROM ci as robot
49+
FROM ci AS robot
5050

5151
# Configure a new non-root user
5252
ARG USERNAME=ros
@@ -116,7 +116,7 @@ RUN sudo apt-get -q update \
116116
WORKDIR $USER_WORKSPACE
117117
RUN sudo apt-get -q update \
118118
&& sudo apt-get -q -y upgrade \
119-
&& rosdep update \
119+
&& rosdep update --include-eol-distros \
120120
&& rosdep install -y --from-paths src --ignore-src -r --rosdistro ${ROS_DISTRO} \
121121
&& sudo apt-get autoremove -y \
122122
&& sudo apt-get clean -y \
@@ -127,7 +127,7 @@ RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" \
127127
&& echo "source ${USER_WORKSPACE}/devel/setup.bash" >> /home/$USERNAME/.bashrc \
128128
&& echo "if [ -f /opt/ros/${ROS_DISTRO}/setup.bash ]; then source /opt/ros/${ROS_DISTRO}/setup.bash; fi" >> /home/$USERNAME/.bashrc
129129

130-
FROM robot as desktop
130+
FROM robot AS desktop
131131

132132
ENV DEBIAN_FRONTEND=noninteractive
133133
ENV USER_WORKSPACE=/home/$USERNAME/ws_dock
@@ -144,7 +144,7 @@ RUN sudo apt-get update \
144144
&& sudo apt-get clean -y \
145145
&& sudo rm -rf /var/lib/apt/lists/*
146146

147-
FROM desktop as desktop-nvidia
147+
FROM desktop AS desktop-nvidia
148148

149149
# Install NVIDIA software
150150
RUN sudo apt-get update \

0 commit comments

Comments
 (0)