From c1cd22b6cc3fd51b4be0d054caadff6703d3ab80 Mon Sep 17 00:00:00 2001
From: Martin Dahl <martin.dahl@gmail.com>
Date: Sun, 11 Jun 2023 22:38:00 +0200
Subject: [PATCH] include test_msgs in docker file + add foxy back

---
 .github/workflows/rust_and_ros2.yml | 11 ++++++++---
 tests/Dockerfile_foxy               | 22 ++++++++++++++++++++++
 tests/Dockerfile_galactic           | 24 ++++++++++++++++++++----
 tests/Dockerfile_humble             | 24 ++++++++++++++++++++----
 tests/test.bash                     | 17 +++++++++++++++++
 tests/test.sh                       |  8 --------
 6 files changed, 87 insertions(+), 19 deletions(-)
 create mode 100644 tests/Dockerfile_foxy
 create mode 100644 tests/test.bash
 delete mode 100644 tests/test.sh

diff --git a/.github/workflows/rust_and_ros2.yml b/.github/workflows/rust_and_ros2.yml
index 3473af3..48b4dae 100644
--- a/.github/workflows/rust_and_ros2.yml
+++ b/.github/workflows/rust_and_ros2.yml
@@ -5,10 +5,9 @@ on: [push, pull_request]
 env:
   CARGO_TERM_COLOR: always
 
-jobs:    
+jobs:
   testing_humble:
     runs-on: ubuntu-latest
-    
     steps:
     - uses: actions/checkout@v2
     - run: docker build . --file ./tests/Dockerfile_humble --tag r2r_test
@@ -16,8 +15,14 @@ jobs:
 
   testing_galactic:
     runs-on: ubuntu-latest
-    
     steps:
     - uses: actions/checkout@v2
     - run: docker build . --file ./tests/Dockerfile_galactic --tag r2r_test
     - run: docker run r2r_test
+
+  testing_foxy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: docker build . --file ./tests/Dockerfile_foxy --tag r2r_test
+    - run: docker run r2r_test
diff --git a/tests/Dockerfile_foxy b/tests/Dockerfile_foxy
new file mode 100644
index 0000000..76973ff
--- /dev/null
+++ b/tests/Dockerfile_foxy
@@ -0,0 +1,22 @@
+# syntax=docker/dockerfile:1
+FROM ros:foxy
+
+# Update default packages
+RUN apt-get update
+
+# Get Ubuntu packages
+RUN apt-get install -y \
+    build-essential \
+    curl \
+    libclang-dev
+
+# Get ros test messages
+RUN apt-get install -y ros-foxy-test-msgs ros-foxy-example-interfaces
+
+# Get Rust
+RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | bash -s -- -y
+RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
+
+COPY . /r2r
+RUN chmod +x /r2r/tests/test.bash
+ENTRYPOINT [ "/r2r/tests/test.bash" ]
diff --git a/tests/Dockerfile_galactic b/tests/Dockerfile_galactic
index 4b41a39..99d7201 100644
--- a/tests/Dockerfile_galactic
+++ b/tests/Dockerfile_galactic
@@ -1,6 +1,22 @@
-FROM kristoferb/spdesktop_ros2:galactic
+# syntax=docker/dockerfile:1
+FROM ros:galactic
+
+# Update default packages
+RUN apt-get update
+
+# Get Ubuntu packages
+RUN apt-get install -y \
+    build-essential \
+    curl \
+    libclang-dev
+
+# Get ros test messages
+RUN apt-get install -y ros-galactic-test-msgs ros-galactic-example-interfaces
+
+# Get Rust
+RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | bash -s -- -y
+RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
 
 COPY . /r2r
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-RUN chmod +x /r2r/tests/test.sh
-ENTRYPOINT [ "/r2r/tests/test.sh" ]
+RUN chmod +x /r2r/tests/test.bash
+ENTRYPOINT [ "/r2r/tests/test.bash" ]
diff --git a/tests/Dockerfile_humble b/tests/Dockerfile_humble
index 54b3efc..76d10d0 100644
--- a/tests/Dockerfile_humble
+++ b/tests/Dockerfile_humble
@@ -1,6 +1,22 @@
-FROM kristoferb/spdesktop_ros2:humble
+# syntax=docker/dockerfile:1
+FROM ros:humble
+
+# Update default packages
+RUN apt-get update
+
+# Get Ubuntu packages
+RUN apt-get install -y \
+    build-essential \
+    curl \
+    libclang-dev
+
+# Get ros test messages
+RUN apt-get install -y ros-humble-test-msgs ros-humble-example-interfaces
+
+# Get Rust
+RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | bash -s -- -y
+RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
 
 COPY . /r2r
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-RUN chmod +x /r2r/tests/test.sh
-ENTRYPOINT [ "/r2r/tests/test.sh" ]
+RUN chmod +x /r2r/tests/test.bash
+ENTRYPOINT [ "/r2r/tests/test.bash" ]
diff --git a/tests/test.bash b/tests/test.bash
new file mode 100644
index 0000000..e0608f5
--- /dev/null
+++ b/tests/test.bash
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# run rustup to test with latest rust version
+/root/.cargo/bin/rustup update
+
+if [ -e "/opt/ros/humble/setup.bash" ]; then
+    source "/opt/ros/humble/setup.bash"
+fi
+if [ -e "/opt/ros/galactic/setup.bash" ]; then
+    source "/opt/ros/galactic/setup.bash"
+fi
+if [ -e "/opt/ros/foxy/setup.bash" ]; then
+    source "/opt/ros/foxy/setup.bash"
+fi
+
+cd /r2r/
+/root/.cargo/bin/cargo test
diff --git a/tests/test.sh b/tests/test.sh
deleted file mode 100644
index e002324..0000000
--- a/tests/test.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-source /opt/ros/humble/setup.bash
-source /opt/ros/galactic/setup.bash
-rustup update
-
-cd /r2r/
-/root/.cargo/bin/cargo test