Skip to content

Commit 22941bc

Browse files
committed
amd
1 parent 3179fd4 commit 22941bc

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.docker/jazzy.amd64.dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROS_DISTRO="jazzy"
22
FROM osrf/ros:$ROS_DISTRO-desktop-full
3-
ARG BRANCH="ros2"
3+
ARG BRANCH="dockertest"
44

55
# Install Utilities
66
# hadolint ignore=DL3008
@@ -39,7 +39,7 @@ RUN adduser --shell /bin/bash --disabled-password --gecos '' $USER \
3939

4040
# Install ROS-Gazebo framework
4141
ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
42-
extras/ros-jazzy-gz-harmonic-install.sh install.sh
42+
extras/ros-jazzy-binary-gz-harmonic-source-install.sh install.sh
4343
RUN bash install.sh
4444

4545
# Set up Dave workspace
@@ -66,4 +66,5 @@ RUN touch /ros_entrypoint.sh && sed --in-place --expression \
6666

6767
# Set User as user
6868
USER $USER
69-
RUN echo "source /opt/ros/jazzy/setup.bash" >> ~/.bashrc
69+
RUN echo "source /opt/ros/jazzy/setup.bash" >> ~/.bashrc && \
70+
echo "source /opt/gazebo/install/setup.bash" >> ~/.bashrc

extras/ros-jazzy-binary-gz-harmonic-source-install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ sudo apt update && apt install -y \
8989

9090
echo
9191
echo -e "\033[34mSetting up Gazebo source directory...\033[0m"
92-
mkdir -p ~/gazebo/src && cd ~/gazebo/src || exit
92+
mkdir -p /opt/gazebo/src && cd /opt/gazebo/src || exit
9393
curl -O https://raw.githubusercontent.com/gazebo-tooling/gazebodistro/master/collection-harmonic.yaml
9494
vcs import < collection-harmonic.yaml
9595

@@ -98,7 +98,7 @@ echo -e "\033[34mUpdating package list and installing dependencies...\033[0m"
9898
sudo apt -y install $(sort -u $(find . -iname 'packages-'`lsb_release -cs`'.apt' -o -iname 'packages.apt' | grep -v '/\.git/') | sed '/gz\|sdf/d' | tr '\n' ' ')
9999

100100
echo -e "\033[34mBuilding the project with colcon...\033[0m"
101-
cd ~/gazebo || exit
101+
cd /opt/gazebo || exit
102102
# Build gz-physics with limited cores to avoid memory issues
103103
MAKEFLAGS="-j2" colcon build --cmake-args -DBUILD_TESTING=OFF --merge-install --packages-up-to gz-physics
104104
# Full build
@@ -109,6 +109,6 @@ echo -e "\033[32m============================================================\03
109109
echo -e "\033[32mROS-Gazebo Framework Installation completed. Awesome! 🤘🚀 \033[0m"
110110
echo -e "Following command will set-up ROS-Gazebo environment variables to run it"
111111
echo -e "\033[95msource /opt/ros/jazzy/setup.bash\033[0m"
112-
echo -e "\033[95msource ~/gazebo/install/setup.bash\033[0m"
112+
echo -e "\033[95msource /opt/gazebo/install/setup.bash\033[0m"
113113
echo -e "You may check ROS, and Gazebo version installed with \033[33mprintenv ROS_DISTRO\033[0m and \033[33mecho \$GZ_VERSION\033[0m"
114114
echo

0 commit comments

Comments
 (0)