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.

Sign up for GitHub

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

Jump to bottom

feat: (reverts #108) full ros2-ws Dockerfile with fixed SHA256 for ros:iron #109

Merged
merged 8 commits into from
May 13, 2024
Merged

feat: (reverts #108) full ros2-ws Dockerfile with fixed SHA256 for ros:iron #109

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
827a4b9
Revert "feat: create ros2-ws image that has ros2-control installed (#…
eeberhard May 10, 2024
cc7dcab
Revert "Revert "refactor: merge ros2-control image into ros2-ws (#100)""
eeberhard May 10, 2024
93f4910
Revert "Revert "feat: add metadata through LABELs (#103)""
eeberhard May 10, 2024
784817d
Revert "Revert "fix: correct user (#105)""
eeberhard May 10, 2024
4bf3b7b
fix: AICA image metadata base version as git tag, not ROS distro
eeberhard May 10, 2024
7d98f0a
feat: use specific SH256 digest for iron base image (2023.09.02)
eeberhard May 10, 2024
eea4f80
feat: add devcontainer metadata
eeberhard May 10, 2024
66a0320
simplify devcontainer metadata
eeberhard May 13, 2024
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
4 changes: 4 additions & 0 deletions ros2_ws/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,7 @@ LABEL org.opencontainers.image.description="AICA base ROS 2 image (includes ros2
LABEL org.opencontainers.image.version="${VERSION}"
LABEL org.opencontainers.image.base.name="${BASE_IMAGE}:${BASE_TAG}"
LABEL tech.aica.image.metadata='{"type":"base/ws","base":{"name":"${BASE_IMAGE}:${BASE_TAG}","version":"${VERSION}"}}'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While the value is correct, the formatting isn't. The previous version used "'${VAR}'" for a specific reason (' strings do not extrapolate variables). This breaks the metadata, see:

                "tech.aica.image.metadata": "{\"type\":\"base/ws\",\"base\":{\"name\":\"${BASE_IMAGE}:${BASE_TAG}\",\"version\":\"${VERSION}\"}}"

LABEL devcontainer.metadata='[{ \
"containerUser": "ros2", \
"mounts": [ "source=${localWorkspaceFolder}/source,target=/home/ros2/ws/src,type=bind,consistency=cached" ], \
eeberhard marked this conversation as resolved.
Show resolved Hide resolved
}]'