[docker,githubactions] Adjusting coppeliasim image to just have itself.

Murilo Marinho · Murilo Marinho · commit 292c95d680ba · 2025-06-30T14:31:47.000+01:00
diff --git a/.devel/noble_coppeliasim/Dockerfile b/.devel/noble_coppeliasim/Dockerfile
@@ -1,6 +1,6 @@
 # Firt version by @juanjqo
 # https://github.com/Adorno-Lab/docker_recipes/blob/main/ubuntu_24/dqrobotics_coppeliasim/Dockerfile
-FROM murilomarinho/sas_ros_jazzy
+FROM ubuntu:noble
 
 ARG COPPELIASIM_RELEASE=V4_7_0_rev4
 ENV COPPELIASIM_RELEASE=$COPPELIASIM_RELEASE
@@ -15,5 +15,5 @@ SHELL ["/bin/bash", "-c"]
 ENV BASH_ENV="/etc/bash_env"
 
 RUN cd ~/sas_install/sas && git pull
-RUN chmod +x ~/sas_install/sas/.devel/scripts/setup_sas_ros_jazzy_coppeliasim.sh
-RUN cd ~/sas_install/sas/.devel/scripts && bash -c "./setup_sas_ros_jazzy_coppeliasim.sh"
+RUN chmod +x ~/sas_install/sas/.devel/scripts/setup_coppeliasim.sh
+RUN cd ~/sas_install/sas/.devel/scripts && bash -c "./setup_coppeliasim.sh"
diff --git a/.devel/scripts/setup_coppeliasim.sh b/.devel/scripts/setup_coppeliasim.sh
@@ -28,4 +28,6 @@ tar -xf "${COPPELIASIM_FILE}"
 
 echo "Setting environment variables for ${COPPELIASIM_FILE}."
 echo "export COPPELIASIM_PATH='${HOME}/utils/CoppeliaSim_Edu_${COPPELIASIM_RELEASE}_${UBUNTU_VERSION}'">> ~/.bashrc
-echo 'alias coppeliasim="$COPPELIASIM_PATH/coppeliaSim.sh &"'>> ~/.bashrc
+## We don't want expansion of $COPPELIASIM_PATH so that the script is still useful if the path changes.
+# shellcheck disable=SC2016
+echo 'alias coppeliasim="$COPPELIASIM_PATH/coppeliaSim.sh &"' >> ~/.bashrc
diff --git a/.github/workflows/docker_with_coppeliasim.yml b/.github/workflows/docker_with_coppeliasim.yml
diff --git a/.github/workflows/docker_with_coppeliasim_dispatch.yml b/.github/workflows/docker_with_coppeliasim_dispatch.yml
@@ -19,10 +19,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and push sas_ros_jazzy_coppeliasim
+      - name: Build and push noble_coppeliasim
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64
           push: true
-          file: .devel/sas_ros_jazzy_coppeliasim/Dockerfile
-          tags: ${{ vars.DOCKER_USERNAME }}/sas_ros_jazzy_coppeliasim
+          file: .devel/noble_coppeliasim/Dockerfile
+          tags: | 
+              ${{ vars.DOCKER_USERNAME }}/noble_coppeliasim:latest
+              ${{ vars.DOCKER_USERNAME }}/noble_coppeliasim:470rev4
diff --git a/.github/workflows/sas_debian_builder.yml b/.github/workflows/sas_debian_builder.yml
@@ -1,5 +1,5 @@
-name: Debian Builder
-on: [push, workflow_dispatch]
+name: SAS Debian Builder
+on: [workflow_dispatch]
 
 jobs:
   debian_builder:
