-
Notifications
You must be signed in to change notification settings - Fork 236
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pick & Place Exercise (Gazebo + Console + Rviz) with web-templates #1153
base: melodic
Are you sure you want to change the base?
Conversation
Rviz is incorporated in the exercise
solves issue #1133 |
scripts/Dockerfile
Outdated
|
||
# RoboticsAcademy | ||
RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master | ||
RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises | ||
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line should not be changed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, will have to change this
scripts/Dockerfile-2.4
Outdated
ENV LD_LIBRARY_PATH "$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/gazebo-9/plugins:/Firmware/build/px4_sitl_default/build_gazebo" | ||
|
||
# RoboticsAcademy | ||
RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master | ||
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line should not be changed
scripts/Dockerfile
Outdated
RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master | ||
RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises | ||
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place | ||
# RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this line commented in Dockerfile, but kept in Dockerfile-2.4?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ohh, I forgot to uncomment this, basically, we are using RADI 2.4, so the changes in the dockerfile didn't affect the testing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah,, ig any changes inside the dockerfile is irrelevant because there is no catkin workspace in it. I'll remove all the changes inside dockerfile.q11
scripts/Dockerfile
Outdated
RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master | ||
RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises | ||
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place | ||
# RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ohh, I forgot to uncomment this, basically, we are using RADI 2.4, so the changes in the dockerfile didn't affect the testing.
scripts/Dockerfile
Outdated
|
||
# RoboticsAcademy | ||
RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master | ||
RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises | ||
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, will have to change this
@@ -8,7 +8,7 @@ | |||
import time | |||
import json | |||
import stat | |||
|
|||
import manager_utils as m_utils |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All specific changes to scripts/manager.py would be a feature accessible to all exercises in JdeRobot Academy.
In this case, it is the addition of the Rviz plugin. I guess other projects would also be making similar changes.
Maybe this should go as a separate feature-issue-pr into JdeRobotAcademy and not part of the pick_place exercise addition PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, Siddharth has already created a pull request related to this: https://github.com/trunc8/RoboticsAcademy/commits/issue-801
I reproduced the branch on my system and the exercise works perfectly. Thanks Chandan (@predator4hack) for your contribution. The number of changes in the current PR (1931) is daunting to review. Probably most of the changes are due to the static files of ace-builds for the website. Keeping those files for new exercise is a necessity I guess. Maybe we can break the PR and get the raw template merged in JdeRobot:master first, in another PR, we can update changes specific to |
Also, the current docker build is from scratch, It took around 2 hours on my system for the build to complete. Can we somehow use RoboticsAcademy current images as our Dockerfile's base image, and have a Dockerfile specifically to build the exercise? this way build time would be shorter I guess. |
Yeah, I guess we can do that |
Yeah, we have multi-stage build for this. Once you create the base image for any version, you can build again on top of it. And you don't need to build the base image again and again, which takes most of the time. |
Industrial Robot exercise doesn't work with RADI2.3 because of the unavailability of the catkin_ws. So the changes for the Dockerfile(RADI2.3) are unnecessary.
No description provided.