build ros1-image on top of ubuntu without ros

ika-rwth-aachen · Jun 10, 2023 · 2fec6e6 · 2fec6e6
1 parent ba2fd76
commit 2fec6e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 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