Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add metadata to docker image #73

Merged
merged 2 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
id: parse-tag

build:
needs: [ get-tag ]
needs: [get-tag]
strategy:
matrix:
arch: [amd64, arm64]
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Release Versions:

## Upcoming changes (in development)

- feat: add metadata to docker image (#73)
- fix(build): copy library to /usr (#71)
- build: copy python packages into /usr instead of ~ros2 to avoid permission issues (#69)
- feat: add is_opened flag to socket base class (#68)
Expand Down
9 changes: 8 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ROS2_VERSION=iron
ARG ROS2_VERSION=v1.0.0-iron
FROM ghcr.io/aica-technology/ros2-ws:${ROS2_VERSION} as base
USER ${USER}

Expand Down Expand Up @@ -131,3 +131,10 @@ COPY --from=apt-dependencies /tmp/apt /
COPY --from=install /tmp/communication-interfaces /usr
COPY --from=python /tmp/python-usr /usr
COPY --from=python-stubs /tmp/python-usr /usr

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}'"}}'
Loading