Skip to content
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

[doc] Small elaboration for Docker image usage #215

Merged
merged 3 commits into from
Oct 2, 2017

Conversation

130s
Copy link
Member

@130s 130s commented Sep 21, 2017

Not sure how effective this change is but trying to address confusion such as #212.

doc/index.rst Outdated
+++++++++++++++++++++++++++++++++++++++

You can use `DOCKER_IMAGE` variable for this.

Copy link
Member

@mathias-luedtke mathias-luedtke Sep 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we should add a note on the requirements that such an image has to meet:

  • wstool
  • rosdep; including repository set-up und python-pip
  • catkin-tools

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rosdep; including repository set-up und python-pip

What is repository set-up? rosdep init && rosdep update?

@@ -39,8 +39,13 @@ ROSWS=wstool
ici_time_end # init_ici_environment

function catkin {
PATH_CATKIN=/usr/bin/catkin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Variable should be kept local. Local variables should be lowercase.

local cmd=$1
shift
if [ ! -f ${PATH_CATKIN} ]; then
echo "[ERR] ${PATH_CATKIN} not available. Make sure ${PKG_CATKIN} is installed. See also https://github.com/ros-industrial/industrial_ci/issues/216";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error function should be used instead. I will take care of the colors and the exit code.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I just couldn't find err was used in the same .sh file so I tried not to use it.

@mathias-luedtke
Copy link
Member

mathias-luedtke commented Sep 22, 2017

I took the chance to improve your warning code.
The new version works with other paths to catkin.

@130s
Copy link
Member Author

130s commented Sep 22, 2017

@ipa-mdl thanks, your change looks good.
How about the earlier commits I made?

Copy link
Member

@mathias-luedtke mathias-luedtke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if we need to address #215 (comment)

Copy link
Member

@mathias-luedtke mathias-luedtke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something went wrong with the last to commit, 0b8edca is now duplicated.

doc/index.rst Outdated
You can pull any `Docker` image by specifying in `DOCKER_IMAGE` variable, as long as the following requirement is ment:

* `python-catkin-tools`, `python-pip`, `python-wstool`
* `python-rosdep` including rosdep repository set-up
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rosdep repository is not required, but ROS repo set-up is.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

@130s
Copy link
Member Author

130s commented Sep 25, 2017

Something went wrong with the last to commit, 0b8edca is now duplicated.

I don't see it duplicated (you may have already fixed it?) but now I don't see an issue?

@mathias-luedtke
Copy link
Member

7bc5355 should not be part of this PR, it's the same patch..

@130s
Copy link
Member Author

130s commented Sep 30, 2017

@ipa-mdl sorry. I rebased and now it should look good.

@mathias-luedtke
Copy link
Member

I think some commits could be squashed, but it is not required.
Feel free to shape it or merge right-away :)

@130s
Copy link
Member Author

130s commented Oct 2, 2017

Some are squashed and CI passed. Thanks @ipa-mdl

@130s 130s merged commit 222d61e into ros-industrial:master Oct 2, 2017
@130s 130s deleted the doc/212_docker_image branch October 2, 2017 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants