diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index 25a6bcf..980e908 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -19,7 +19,7 @@ jobs: id: parse-tag build: - needs: [ get-tag ] + needs: [get-tag] strategy: matrix: arch: [amd64, arm64] @@ -42,13 +42,14 @@ jobs: with: image_name: aica-technology/network-interfaces image_tags: ${{ steps.merge-tags.outputs.list }} + build_flags: --build-arg VERSION=${{ needs.get-tag.outputs.tag }} dockerfile_path: Dockerfile token: ${{ secrets.GITHUB_TOKEN }} multi-arch: runs-on: ubuntu-latest name: Merge into a multi-arch image - needs: [ get-tag, build ] + needs: [get-tag, build] steps: - uses: aica-technology/.github/.github/actions/ghcr-manifest-merge@v0.6.1 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index afb82d3..5fb41d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ Release Versions: +- [2.0.2](#202) - [2.0.1](#201) - [2.0.0](#200) - [1.4.1](#141) @@ -13,6 +14,11 @@ Release Versions: - [0.2.0](#020) - [0.1.0](#010) +## 2.0.2 + +Version 2.0.2 is a retro-active patch that adds metadata to the network-interfaces Docker image required for +aica-technology/package-builder:v1. + ## 2.0.1 Version 2.0.1 contains a hotfix that enables socket communiction with any serialized message in Python, which was not diff --git a/Dockerfile b/Dockerfile index 0c65739..3fff21b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG ROS2_VERSION=humble -FROM ghcr.io/aica-technology/ros2-ws:humble as base +ARG ROS2_VERSION=v1.0.1-iron +FROM ghcr.io/aica-technology/ros2-ws:${ROS2_VERSION} as base USER ${USER} FROM base as apt-dependencies @@ -133,3 +133,10 @@ COPY --from=apt-dependencies /tmp/apt / COPY --from=install /tmp/communication-interfaces /usr/local COPY --from=python /tmp/python-home/ /home COPY --from=python-stubs /tmp/python-home /home + +ARG VERSION +ARG ROS2_VERSION +LABEL org.opencontainers.image.title="AICA network-interfaces library" +LABEL org.opencontainers.image.description="AICA network-interfaces library (for ${ROS2_VERSION})" +LABEL org.opencontainers.image.version="${VERSION}" +LABEL tech.aica.image.metadata='{"type":"lib","base":{"name":"@aica/foss/ros2-ws","version":"'${ROS2_VERSION}'"}}' \ No newline at end of file diff --git a/build.sh b/build.sh index 341e27b..661bf4a 100644 --- a/build.sh +++ b/build.sh @@ -3,7 +3,7 @@ IMAGE_NAME=ghcr.io/aica-technology/network-interfaces IMAGE_TAG=latest -ROS2_VERSION=humble +ROS2_VERSION=v1.0.1-iron HELP_MESSAGE="Usage: build.sh [options] Options: