Skip to content

Commit

Permalink
mv build-essentials before custom.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
jpbusch committed Jun 13, 2023
1 parent 8035418 commit 0769e8f
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,11 @@ RUN apt-get update && \
ARG ADDITIONAL_FILES_DIR
ADD ${ADDITIONAL_FILES_DIR}* /docker-ros/additional-files/
# install dependencies for install script
# install essential build tools and dependencies for install script
RUN apt-get update && \
apt-get install -y \
build-essential \
gosu \
python-is-python3 \
python3-pip \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -162,12 +164,9 @@ RUN apt-get update && \
$WORKSPACE/.install-dependencies.sh && \
rm -rf /var/lib/apt/lists/*
# install essential build and ROS CLI tools
RUN apt-get update && \
apt-get install -y \
build-essential \
gosu \
&& source /opt/ros/$ROS_DISTRO/setup.bash && \
# install ROS CLI tools
RUN source /opt/ros/$ROS_DISTRO/setup.bash && \
apt-get update && \
if [[ "$ROS_VERSION" == "1" ]]; then \
apt-get install -y \
python3-catkin-tools ; \
Expand Down

0 comments on commit 0769e8f

Please sign in to comment.