Skip to content

Conversation

j-rivero
Copy link
Contributor

@j-rivero j-rivero commented Sep 2, 2024

🎉 New feature

Simplify the docker setup for the relay example by removing the build.sh and run.sh scripts that were adding helpers for development but were really not needed to run the important code.

Summary

The two commits are self-explanatory:

  • 5e55b3f simplifies the Dockerfile in place and move it to Ubuntu Noble
  • 9318d58 removes all the jazz added to run docker and replace it on the instructions

Test it

I've verified that it builds just fine. @caguero verified that it runs fine.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.
gazebo-release) (as needed):

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Removed build.sh and run.sh scripts that were really not
needed to just run the relay example. Modify the
instructions accordingly.

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero j-rivero requested a review from caguero as a code owner September 2, 2024 16:03
@j-rivero j-rivero changed the title Jrivero/simplify docker Simplify the relay tutorial docker setup Sep 2, 2024
@@ -0,0 +1,68 @@
# Ubuntu 22.04
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nit: 24.04

Copy link
Contributor Author

Choose a reason for hiding this comment

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


# Install gazebo dependencies
RUN /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' \
&& /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/gazebo/ubuntu-prerelease `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-prerelease.list' \
Copy link
Collaborator

Choose a reason for hiding this comment

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

I used this for testing but I think we should remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Collaborator

@caguero caguero left a comment

Choose a reason for hiding this comment

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

Retarget to gz-transport14?

@j-rivero j-rivero changed the base branch from main to gz-transport14 September 2, 2024 18:23
./run.bash gz-transport
```

Inside the docker instance, go to the `example` directory:
Copy link
Collaborator

Choose a reason for hiding this comment

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

The order here should be:

Run your Docker container:
docker run -it --rm gz-transport-relay /bin/bash

Inside the docker instance, go to the example directory:
cd /tmp/gz-transport/example/build

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The final WORKDIR at the end of the Dockerfile should leave you exactly in that directory ready to run the example binary https://github.com/gazebosim/gz-transport/pull/530/files#diff-f34da55ca08f1a30591d8b0b3e885bcc678537b2a9a4aadea4f190806b374ddcR64

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@j-rivero j-rivero requested a review from caguero September 4, 2024 15:11
@j-rivero j-rivero merged commit 591c313 into gz-transport14 Sep 4, 2024
9 of 10 checks passed
@j-rivero j-rivero deleted the jrivero/simplify_docker branch September 4, 2024 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants