use rwthika/ros:jazzy base image for jazzy image

ika-rwth-aachen · Sep 16, 2024 · 0027704 · 0027704
1 parent 1a54ca9
commit 0027704
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/docker-ros.yml b/.github/workflows/docker-ros.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           platform: amd64
           target: dev,run
-          image-tag: ros2
+          image-tag: ros2-humble
           base-image: rwthika/ros2:humble
           command: ros2 launch etsi_its_conversion converter.launch.py
           enable-industrial-ci: 'true'
@@ -51,9 +51,8 @@ jobs:
           platform: amd64
           target: dev,run
           image-tag: ros2-jazzy
-          base-image: ubuntu:24.04
-          ros-distro: jazzy
+          enable-push-as-latest: 'true'
+          base-image: rwthika/ros2:jazzy
           command: ros2 launch etsi_its_conversion converter.launch.py
           enable-industrial-ci: 'true'
-          enable-push-as-latest: 'true'
           enable-recursive-vcs-import: 'false'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ ros2-humble:
   variables:
     PLATFORM: amd64,arm64
     TARGET: dev,run
-    IMAGE_TAG: ros2
+    IMAGE_TAG: ros2-humble
     BASE_IMAGE: rwthika/ros2:humble
     COMMAND: ros2 launch etsi_its_conversion converter.launch.py
     ENABLE_INDUSTRIAL_CI: 'true'
@@ -56,10 +56,8 @@ ros2-jazzy:
     PLATFORM: amd64,arm64
     TARGET: dev,run
     IMAGE_TAG: ros2-jazzy
-    # TODO: switch to rwthika/ros2:jazzy, once available
-    BASE_IMAGE: ubuntu:24.04
-    ROS_DISTRO: jazzy
+    ENABLE_PUSH_AS_LATEST: 'true'
+    BASE_IMAGE: rwthika/ros2:jazzy
     COMMAND: ros2 launch etsi_its_conversion converter.launch.py
     ENABLE_INDUSTRIAL_CI: 'true'
-    ENABLE_PUSH_AS_LATEST: 'true'
     ENABLE_RECURSIVE_VCS_IMPORT: 'false'