Remove Submodule & Fix Dockerfile

- Remove gazebo source submodule
- Fix dockerfile to use sudo to install ariac3 package
- Remove instructions related to submodule
- Remove sourcing setup.bash in workspace from instructions
This commit is contained in:
Sravan Balaji
2020-04-12 14:45:24 -04:00
parent 705f7ac662
commit 75f0d553fe
4 changed files with 9 additions and 20 deletions

3
.gitmodules vendored
View File

@@ -1,3 +0,0 @@
[submodule "rrrobot_src/warehouse/src/ariac"]
path = rrrobot_src/warehouse/src/ariac
url = https://github.com/osrf/ariac-gazebo_ros_pkgs.git

View File

@@ -36,14 +36,15 @@ RUN echo "export GAZEBO_PLUGIN_PATH=/home/rrrobot/rrrobot_src/lib:\$GAZEBO_PLUGI
USER rrrobot
# Install Gazebo Environment for Agile Robotics (GEAR)
RUN sudo apt-get update && \
sudo apt-get install -y \
wget
RUN sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable bionic main" > /etc/apt/sources.list.d/gazebo-stable.list' && \
wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - && \
apt-get update && \
apt-get install -y \
sudo apt-get update && \
sudo apt-get install -y \
ariac3
CMD ["/bin/bash"]

View File

@@ -102,27 +102,19 @@ Additionally, be sure to update the `IP_ADDRESS` variable in [.env](src/.env) wi
### Warehouse Simulation
1. Clone repo
- HTTPS: `git clone https://github.com/EECS-467-W20-RRRobot-Project/RRRobot.git`
- SSH: `git clone git@github.com:EECS-467-W20-RRRobot-Project/RRRobot.git`
2. Go to `RRRobot` folder
- `cd /PATH/TO/RRRobot`
3. Get submodule(s)
- `git submodule init`
4. Go to `docker_env` folder
1. Go to `docker_env` folder
- `cd /PATH/TO/RRRobot/docker_env`
5. Start gazebo docker container
2. Start gazebo docker container
- `docker-compose run --rm warehouse`
6. Source ROS Setup
3. Source ROS Setup
- `source /opt/ros/melodic/setup.bash`
7. Go to warehouse folder in container
4. Go to warehouse folder in container
- `cd /app/rrrobot_src/warehouse`
8. Build package
5. Build package
- `catkin_make clean`
- `catkin_make`
- `catkin_make install`
- `source devel/setup.bash`
9. Run sample environment
6. Run sample environment
- `roslaunch osrf_gear sample_environment.launch`
### Gazebo Grasping Simulation