From 2fec6e6f62fa0f4bac1daad67e4ac8a90288271d Mon Sep 17 00:00:00 2001
From: Lennart Reiher <lennart.reiher@ika.rwth-aachen.de>
Date: Sat, 10 Jun 2023 22:13:37 +0200
Subject: [PATCH] build ros1-image on top of ubuntu without ros

---
 .github/workflows/ros.yml | 10 ++++++----
 .gitlab-ci.yml            |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ros.yml b/.github/workflows/ros.yml
index ae73de7..9b9cca5 100644
--- 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
index bacd006..a39079d 100644
--- 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