Skip to content

Commit

Permalink
Merge commit Fix up the mess I made...
Browse files Browse the repository at this point in the history
  • Loading branch information
SeniorKullken committed Aug 18, 2024
2 parents a07aaaa + 2cafe85 commit 5e0f1fb
Show file tree
Hide file tree
Showing 12 changed files with 121 additions and 20 deletions.
1 change: 0 additions & 1 deletion amd64-jazzy-full/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series
#----------------------
#
# Build this Docker image with:
#----------------------
Expand Down
7 changes: 6 additions & 1 deletion amd64-jazzy-full/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series
#----------------------
#
# "jazzy" = ROS2 24.04
# "noble" = Ubuntu 24.04
#
# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
services:
ros2:
build: ./
Expand Down
5 changes: 3 additions & 2 deletions amd64-jazzy-full/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series
#----------------------
#

# "jazzy" = ROS2 24.04
# "noble" = Ubuntu 24.04

# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
docker pull osrf/ros:jazzy-desktop-full
docker build --tag kullken/ros2_amd64:jazzy-full .
11 changes: 10 additions & 1 deletion amd64-jazzy-full/docker_exec.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
#!/bin/bash
# Start bash in existing container (Status Up/Paused).
#----------------------
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series

# "jazzy" = ROS2 24.04
# "noble" = Ubuntu 24.04

# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
docker exec -it --env HOSTUSER=$USER jazzy-full-container bash
docker exec -it --env HOSTUSER=$USER jazzy-full-container bash
11 changes: 10 additions & 1 deletion amd64-jazzy-full/docker_pull.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
#!/bin/bash
# Download docker image from https://hub.docker.com/repositories/kullken
#----------------------
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series

# "jazzy" = ROS2 24.04
# "noble" = Ubuntu 24.04

# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
docker pull kullken/ros2_amd64:jazzy-full
9 changes: 9 additions & 0 deletions amd64-jazzy-full/docker_push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,14 @@
# Prerequisite:
# $ docker login -u "kullken" -p "@@@@@@@@" docker.io
#
#----------------------
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series

# "jazzy" = ROS2 24.04
# "noble" = Ubuntu 24.04

# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
docker push kullken/ros2_amd64:jazzy-full
11 changes: 10 additions & 1 deletion amd64-jazzy-full/docker_rm.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
#!/bin/bash
# Remove existing container (Prereq: Status=Exited/Stoped)
#----------------------
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series

# "jazzy" = ROS2 24.04
# "noble" = Ubuntu 24.04

# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
docker container rm jazzy-full-container
docker container rm jazzy-full-container
36 changes: 34 additions & 2 deletions amd64-jazzy-full/docker_run.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,38 @@
#!/bin/bash
# Run docker image from https://hub.docker.com/repositories/kullken
docker run \
# Run existing Docker Image and create + start a Docker Container
# - AMD64/x86 CPU Architecture
# - ROS Version: ROS2 20.24 LTS (AMD64) aka."jazzy"
# - OS version : Ubuntu 24.04 LTS (AMD64) aka."noble"
# - Source Image = osrf/ros:jazzy-desktop-full
# - Target Container = jazzy-full-container
#
# 1) Mount your local docker-host </home/{$USER}>-folder into the container
# This means your local docker-host ~/bashrc will be executed.
# 2) Mount local docker host </etc/group + /etc/passwd + ...etc.>
# To offer seamless right & user/group ID.
# 3) Mount local docker host </etc/localtime>
# To ensure that the host and container have the same time zone
# 4) Mount local docker host </tmp/.X11-unix>
# To enable GUI/X11 applications inside container
# Needs to be combined with exporting '$DISPLAY' and running '$ xhost local:docker' before starting the conatiner.
#
# --------A few other commands that may be useful to know....
# docker exec -it jazzy-full-container bash
# docker container pause jazzy-full-container
# docker container stop jazzy-full-container
# docker container restart jazzy-full-container
# docker container kill jazzy-full-container
# docker container rm jazzy-full-container
# docker container prune
#----------------------
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series
#----------------------
# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
xhost local:docker
docker run \
-it \
--name jazzy-full-container \
--env DISPLAY=$DISPLAY \
Expand Down
27 changes: 19 additions & 8 deletions amd64-jazzy/docker-compose_ROS2talker-listener.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
# ROS2 test/tutorial - Pull down/Run/Launch two nodes in two separate docker containers.
# Using the built in ros2 package 'demo_nodes_cpp' with the two nodes 'talker' & 'listener'
# ROS2 test/tutorial - Run the ROS2 demo_node 'talker' and 'listener'
#
# I Pull down Docker Image.
# Create and run two Docker services with eatch new/created Docker Container.
# - Docker Container 1 'amd64-jazzy-talker-1'
# - Docker Container 2 'amd64-jazzy-listener-1'
# - Docker Network amd64-jazzy_default
# II In eatch Docker Services/Container - Launch Command ROS2 demo_node 'talker' and 'listener'
#
# 1) Launch the nodes
# $ docker compose --file docker-compose_ROS2talker-listener.yml up
# ... ✔ Container1 0.0s
# ... ✔ Container2
#
# 2) ...press <Ctrl><C> to stop
# 2) ...press <Ctrl><C> to stop the two Docker Services/Container.
#
# 3) Remove the two containers AND the Network "amd64-jazzy_default"
# 3) Remove the two Docker Containers AND the Docker Network "amd64-jazzy_default"
# $ docker compose --file docker-compose_ROS2talker-listener.yml down
#
# More info:
# - https://docs.ros.org/en/jazzy/How-To-Guides/Run-2-nodes-in-single-or-separate-docker-containers.html
# - https://hub.docker.com/_/ros
#
#----------------------
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series
#----------------------
# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
# More info: https://docs.ros.org/en/jazzy/How-To-Guides/Run-2-nodes-in-single-or-separate-docker-containers.html
# More info: https://hub.docker.com/_/ros
services:
talker:
image: osrf/ros:jazzy-desktop
Expand Down
9 changes: 8 additions & 1 deletion amd64-jazzy/docker-compose_jazzy-desktop-full-noble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@
# 2) Connect bash to existing/new container:
# $ docker exec -it jazzy-desktop-full-noble-container bash
#
#----------------------
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series
#----------------------
# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
services:
bash:
bash:
image: osrf/ros:jazzy-desktop-full-noble
container_name: jazzy-desktop-full-noble-container
network_mode: host
Expand Down
7 changes: 7 additions & 0 deletions amd64-jazzy/docker-compose_noble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
# 2) Connect bash to existing/new container:
# $ docker exec -it ubuntu-nobel-container bash
#
#----------------------
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series
#----------------------
# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
services:
bash:
image: ubuntu:noble
Expand Down
7 changes: 5 additions & 2 deletions amd64-jazzy/docker_run.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# Run Image and create Container
# Run existing Docker Image and create + start a Docker Container
# - AMD64/x86 CPU Architecture
# - ROS Version: ROS2 20.24 LTS (AMD64) aka."Jazzy"
# - ROS Version: ROS2 20.24 LTS (AMD64) aka."jazzy"
# - OS version : Ubuntu 24.04 LTS (AMD64) aka."noble"
# - Source Image = osrf/ros:jazzy-desktop-full
# - Target Container = jazzy-full-container
Expand All @@ -23,11 +23,14 @@
# docker container restart jazzy-full-container
# docker container kill jazzy-full-container
# docker container rm jazzy-full-container
# docker container prune
#----------------------
# Maintainer: stefan.kull@gmail.com
# Licens: MIT
# https://github.com/Pet-Series
#----------------------
# More info: https://github.com/Pet-Series/pet_docker
# More info: https://hub.docker.com/repositories/kullken
xhost local:docker
docker run -it \
--name jazzy-full-container \
Expand Down

0 comments on commit 5e0f1fb

Please sign in to comment.