Update working images

icub-tech-iit · Dec 27, 2023 · c8d38bc · c8d38bc
1 parent e272021
commit c8d38bc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/dockerfile_images/basic/superbuild-gazebo/Dockerfile b/dockerfile_images/basic/superbuild-gazebo/Dockerfile
@@ -40,8 +40,8 @@ RUN mkdir -p /etc/bash_completion.d/ && \
         vim
 
 # Get gazebo from the osrf repo
-RUN wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null
+RUN wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg &&\
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null &&\
     apt-get update &&\
     apt-get install -y gz-harmonic
 

diff --git a/dockerfile_images/basic/superbuild-gazebo/conf_build.ini b/dockerfile_images/basic/superbuild-gazebo/conf_build.ini
@@ -1,6 +1,6 @@
 [sources]
 START_IMG=ubuntu:jammy
-$(cat DATE_TAG)
+metadata={{steps.get_date.outputs.DATE_HOUR}}
 release={{steps.get_version.outputs.VERSION}}
 sbtag={{matrix.tag}}
 

diff --git a/dockerfile_images/basic/superbuild-icubhead/Dockerfile b/dockerfile_images/basic/superbuild-icubhead/Dockerfile
@@ -25,6 +25,7 @@ ARG CMAKE_EXTRA_OPTIONS=-j4
 ARG INSTALL_DIR="/usr/local"
 ARG release
 ARG sbtag
+ARG metadata
 ARG METADATA_FILE
 ARG ROBOTOLOGY_INITIALIZATION_FILE=/usr/local/bin/setup_robotology_tdd.sh
 

diff --git a/dockerfile_images/basic/superbuild-ros2/conf_build.ini b/dockerfile_images/basic/superbuild-ros2/conf_build.ini
@@ -1,6 +1,6 @@
 [sources]
 START_IMG={{env.REGISTRY}}/{{env.REPOSITORY_NAME}}/{{env.IMAGE_PREFIX}}superbuild-icubhead:{{steps.get_version.outputs.VERSION}}{{steps.get_version.outputs.TAG}}_sources
-$(cat DATE_TAG)
+metadata={{steps.get_date.outputs.DATE_HOUR}}
 release={{steps.get_version.outputs.VERSION}}
 sbtag={{matrix.tag}}
 

diff --git a/dockerfile_images/demos/moveit-gazebo/conf_build.ini b/dockerfile_images/demos/moveit-gazebo/conf_build.ini
@@ -1,6 +1,6 @@
 [sources]
 START_IMG={{env.REGISTRY}}/{{env.REPOSITORY_NAME}}/{{env.IMAGE_PREFIX}}superbuild-ros2:{{steps.get_version.outputs.VERSION}}{{steps.get_version.outputs.TAG}}_sources
-$(cat DATE_TAG)
+metadata={{steps.get_date.outputs.DATE_HOUR}}
 release={{steps.get_version.outputs.VERSION}}
 sbtag={{matrix.tag}}