Merge branch 'ROS1/2-Galactic/Noetic-stuff'

arm64-pet-galactic/Dockerfile

@@ -96,6 +96,7 @@ RUN apt-get update -y &&\
 USER root
 RUN apt-get update -y &&\
     apt-get install -y \
+        python3-pip \
         i2c-tools \
         net-tools \
         libraspberrypi-bin \
@@ -135,7 +136,7 @@ RUN echo '# Setting up my own fancy Terminal Prompt :-)'                  >> ${H
     echo 'source /opt/ros/galactic/setup.bash'                              >> /home/pet/.bashrc &&\
     echo "alias noetic='source /opt/ros/noetic/setup.bash'"                 >> ${HOMEDIR}/.bashrc &&\
     echo "alias galactic='source /opt/ros/galactic/setup.bash'"             >> ${HOMEDIR}/.bashrc &&\
-    echo "alias pet_source='source ${HOMEDIR}/ws_ros2-galactic/install/setup.bash'" >> ${HOMEDIR}/.bashrc
+    echo "alias pet_source='source ${HOMEDIR}/ws_ros2/install/setup.bash'"  >> ${HOMEDIR}/.bashrc
 
 # Setup exit conditions
 USER ${DOCKERUSER}

arm64-pet-galactic/docker-compose.yml

@@ -46,7 +46,8 @@
 #  - https://hub.docker.com/r/arm64v8/ros/tags?page=1&name=galactic
 #  - https://hub.docker.com/r/arm64v8/ros/tags?page=1&name=noetic
 
-  ros2:
+services:
+  ros1-2:
     build: .
     image: kullken/ros2_arm64v8:pet-base-galactic
     container_name: pet-base-galactic_container
@@ -67,7 +68,7 @@
       - /dev/vchiq:/dev/vchiq:ro         # Broadcom/CPU-core stuff...
 
     volumes:
-      - /home/pi/ws_ros2:/home/pet/ws_ros2:rw   # Shared developing/source code folder.
+      - /home/pi/ws_ros2-galactic:/home/pet/ws_ros2:rw   # Shared developing/source code folder.
       - /etc/localtime:/etc/localtime:ro        # Sync docker image/container date & timezone with docker-host
       - /proc/device-tree:/proc/device-tree:ro  # Broadcom/CPU-core stuff...
       - /usr/bin/vcgencmd:/usr/bin/vcgencmd:ro  # Broadcom/CPU-core stuff...