From fe193733c6512429007edb609907b42f07d72085 Mon Sep 17 00:00:00 2001 From: Dominic Reber <71256590+domire8@users.noreply.github.com> Date: Wed, 27 Sep 2023 12:00:51 +0200 Subject: [PATCH] build: use iron as ros2 distro (#53) --- CHANGELOG.md | 5 +++-- Dockerfile | 4 ++-- VERSION | 2 +- build.sh | 13 +++++++++++-- doxygen/doxygen.conf | 2 +- source/modulo_component_interfaces/package.xml | 2 +- source/modulo_components/package.xml | 2 +- source/modulo_core/package.xml | 2 +- source/modulo_utils/package.xml | 2 +- 9 files changed, 22 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fe6e5b1d..24c7a784c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,10 @@ Release Versions: ## Upcoming changes (in development) -- feat: add on_step_callback for component (#51) -- build: unify dockerfiles and add vs code configuration (#50) - Revise test stage to fail on test errors (#48) +- build: unify dockerfiles and add vs code configuration (#50) +- feat: add on_step_callback for component (#51) +- build: use iron as ros2 distro (#53) ## 3.0.0 diff --git a/Dockerfile b/Dockerfile index b127175ba..ead4f5a2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.4.0 -ARG CL_VERSION=v7.1.1 -ARG ROS2_VERSION=humble +ARG CL_VERSION=v7.2.0 +ARG ROS2_VERSION=iron FROM ghcr.io/aica-technology/control-libraries:${CL_VERSION} as cl FROM ghcr.io/aica-technology/ros2-ws:${ROS2_VERSION} as base # setup the environment diff --git a/VERSION b/VERSION index 75a22a26a..b0f2dcb32 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.3 +3.0.4 diff --git a/build.sh b/build.sh index e476419ec..dca14ae30 100755 --- a/build.sh +++ b/build.sh @@ -3,8 +3,8 @@ IMAGE_NAME=ghcr.io/aica-technology/modulo IMAGE_TAG=latest -ROS2_VERSION=humble -CL_VERSION=v7.1.1 +ROS2_VERSION=iron +CL_VERSION=v7.2.0 SSH_PORT=4440 @@ -17,6 +17,12 @@ Options: --cl-version Specify the version of the control libraries image to use. (default: $CL_VERSION) + --ros2-version Specify the version of ROS 2 to use. + (default: $ROS2_VERSION) + + --tag Specify the tag of the generated image. + (default: $IMAGE_TAG) + -v|--verbose Set the build output to verbose. --cache-id Invalidate the mount cache (e.g. CMake build folder) @@ -35,6 +41,8 @@ while [ "$#" -gt 0 ]; do --test) BUILD_FLAGS+=(--target=test); TEST=1; IMAGE_TAG=test; shift 1;; -s|--serve) BUILD_FLAGS+=(--target build); SERVE_REMOTE=1; IMAGE_TAG=build; shift 1;; --cl-version) CL_VERSION=$2; shift 2;; + --ros2-version) ROS2_VERSION=$2; shift 2;; + --tag) IMAGE_TAG=$2; shift 2;; -v|--verbose) BUILD_FLAGS+=(--progress=plain); shift 1;; --cache-id) BUILD_FLAGS+=(--build-arg CACHEID=$2); shift 2;; -r|--no-cache) BUILD_FLAGS+=(--no-cache); BUILD_FLAGS+=(--build-arg CACHEID=$(date +%s)); shift 1;; @@ -50,6 +58,7 @@ if [ "$((TEST + SERVE_REMOTE))" -gt 1 ]; then fi BUILD_FLAGS+=(--build-arg CL_VERSION="${CL_VERSION}") +BUILD_FLAGS+=(--build-arg ROS2_VERSION="${ROS2_VERSION}") BUILD_FLAGS+=(-t "${IMAGE_NAME}:${IMAGE_TAG}") DOCKER_BUILDKIT=1 docker build "${BUILD_FLAGS[@]}" . || exit 1 diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf index 8079e1636..722b38621 100644 --- a/doxygen/doxygen.conf +++ b/doxygen/doxygen.conf @@ -38,7 +38,7 @@ PROJECT_NAME = "Modulo" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.0.3 +PROJECT_NUMBER = 3.0.4 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/source/modulo_component_interfaces/package.xml b/source/modulo_component_interfaces/package.xml index c1a07c93c..b7b6b8c20 100644 --- a/source/modulo_component_interfaces/package.xml +++ b/source/modulo_component_interfaces/package.xml @@ -2,7 +2,7 @@ modulo_component_interfaces - 3.0.3 + 3.0.4 Interface package for communicating with modulo components through the ROS framework Enrico Eberhard GPLv3 diff --git a/source/modulo_components/package.xml b/source/modulo_components/package.xml index 1d329f272..d51e6cd84 100644 --- a/source/modulo_components/package.xml +++ b/source/modulo_components/package.xml @@ -2,7 +2,7 @@ modulo_components - 3.0.3 + 3.0.4 Modulo base classes that wrap ROS2 Nodes as modular components for the AICA application framework Baptiste Busch Enrico Eberhard diff --git a/source/modulo_core/package.xml b/source/modulo_core/package.xml index c148e538b..c99f789cd 100644 --- a/source/modulo_core/package.xml +++ b/source/modulo_core/package.xml @@ -2,7 +2,7 @@ modulo_core - 3.0.3 + 3.0.4 Modulo Core communication and translation utilities for interoperability with AICA Control Libraries Baptiste Busch Enrico Eberhard diff --git a/source/modulo_utils/package.xml b/source/modulo_utils/package.xml index 36b940909..800e55b38 100644 --- a/source/modulo_utils/package.xml +++ b/source/modulo_utils/package.xml @@ -2,7 +2,7 @@ modulo_utils - 3.0.3 + 3.0.4 Modulo utils package for shared test fixtures Dominic Reber GPLv3