Merge branch 'improvement/naming-of-special-files' into 'main'

Adjust naming of special files and improve testing See merge request fb-fi/ops/docker-ros-ci!3
ika-rwth-aachen · Jun 12, 2023 · 914c491 · 914c491
2 parents fa0ff08 + 2fec6e6
commit 914c491
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 13 deletions.
diff --git a/.github/workflows/ros.yml b/.github/workflows/ros.yml
@@ -22,13 +22,14 @@ jobs:
         uses: jenseng/dynamic-uses@v1
         with:
           uses: ika-rwth-aachen/docker-ros@${{ github.event.inputs.docker-ros-git-ref }}
-          with: '{ "base-image": "rwthika/ros:latest", "command": "roscore", "platform": "amd64", "target": "dev,run", "build-context": "ros1", "image-tag": "ros1", "enable-industrial-ci": "true"}'
+          with: '{ "base-image": "ubuntu:20.04", "ros-distro": "noetic", "command": "roscore", "platform": "amd64", "target": "dev,run", "build-context": "ros1", "image-tag": "ros1", "enable-industrial-ci": "true"}'
 
       - name: docker-ros
         if: ${{ github.event_name == 'push' }}
         uses: ika-rwth-aachen/docker-ros@main
         with:
-          base-image: rwthika/ros:latest
+          base-image: ubuntu:20.04
+          ros-distro: noetic
           command: roscore
           platform: amd64,arm64
           target: dev,run
@@ -50,13 +51,14 @@ jobs:
         uses: jenseng/dynamic-uses@v1
         with:
           uses: ika-rwth-aachen/docker-ros@${{ github.event.inputs.docker-ros-git-ref }}
-          with: '{ "base-image": "rwthika/ros:latest", "command": "roscore", "platform": "${{ matrix.platform }}", "target": "${{ matrix.target }}", "build-context": "ros1", "image-tag": "ros1", "enable-industrial-ci": "true", "enable-singlearch-push": "true"}'
+          with: '{ "base-image": "ubuntu:20.04", "ros-distro": "noetic", "command": "roscore", "platform": "${{ matrix.platform }}", "target": "${{ matrix.target }}", "build-context": "ros1", "image-tag": "ros1", "enable-industrial-ci": "true", "enable-singlearch-push": "true"}'
 
       - name: docker-ros
         if: ${{ github.event_name == 'push' }}
         uses: ika-rwth-aachen/docker-ros@main
         with:
-          base-image: rwthika/ros:latest
+          base-image: ubuntu:20.04
+          ros-distro: noetic
           command: roscore
           platform: ${{ matrix.platform }}
           target: ${{ matrix.target }}

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -2,7 +2,8 @@ include:
   - remote: https://raw.githubusercontent.com/ika-rwth-aachen/docker-ros/$DOCKER_ROS_GIT_REF/.gitlab-ci/docker-ros.yml
 
 variables:
-  BASE_IMAGE: rwthika/ros:latest
+  BASE_IMAGE: ubuntu:20.04
+  ROS_DISTRO: noetic
   COMMAND: rostopic list
   PLATFORM: amd64,arm64
   TARGET: dev,run

diff --git a/ros1/additional.apt-dependencies b/ros1/additional.apt-dependencies
diff --git a/ros1/custom.sh b/ros1/custom.sh
diff --git a/ros1/docker/additional-debs.txt b/ros1/docker/additional-debs.txt
@@ -0,0 +1 @@
+toilet
diff --git a/ros1/files/helloWorld.txt → ros1/docker/additional-files/hello-world.txt b/ros1/files/helloWorld.txt → ros1/docker/additional-files/hello-world.txt
diff --git a/ros1/docker/additional-pip-requirements.txt b/ros1/docker/additional-pip-requirements.txt
@@ -0,0 +1 @@
+docker-run-cli
diff --git a/ros1/docker/custom.sh b/ros1/docker/custom.sh
@@ -0,0 +1,10 @@
+set -e
+
+# check additional-debs.txt
+toilet docker-ros
+
+# check additional-pip-requirements.txt
+python -c "import docker_run"
+
+# check additional-files/
+cat /docker-ros/additional-files/hello-world.txt
diff --git a/ros2/additional.apt-dependencies b/ros2/additional.apt-dependencies
diff --git a/ros2/custom.sh b/ros2/custom.sh
diff --git a/ros2/docker/additional-debs.txt b/ros2/docker/additional-debs.txt
@@ -0,0 +1 @@
+toilet
diff --git a/ros2/files/helloWorld.txt → ros2/docker/additional-files/hello-world.txt b/ros2/files/helloWorld.txt → ros2/docker/additional-files/hello-world.txt
diff --git a/ros2/docker/additional-pip-requirements.txt b/ros2/docker/additional-pip-requirements.txt
@@ -0,0 +1 @@
+docker-run-cli
diff --git a/ros2/docker/custom.sh b/ros2/docker/custom.sh
@@ -0,0 +1,10 @@
+set -e
+
+# check additional-debs.txt
+toilet docker-ros
+
+# check additional-pip-requirements.txt
+python -c "import docker_run"
+
+# check additional-files/
+cat /docker-ros/additional-files/hello-world.txt