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

refactor: merge ros2-control image into ros2-ws #100

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Conversation

domire8
Copy link
Member

@domire8 domire8 commented Apr 25, 2024

Description

Next part of the issue: Merging the ros2 control dockerfile with the one and only ros2-ws image. I used a little trick with the stages and BASE_TAG that would potentially allow a build of different ROS distros if we added for example a ros2-control-jazzy stage.

Next up: reworking the CI.

Review guidelines

Estimated Time of Review: 5 minutes

Checklist before merging:

  • Confirm that the relevant changelog(s) are up-to-date in case of any user-facing changes

Copy link
Member

@eeberhard eeberhard left a comment

Choose a reason for hiding this comment

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

pretty straightforward, nice!

@domire8 domire8 merged commit 5c6d2bf into refactor Apr 26, 2024
@domire8 domire8 deleted the feat/one-image branch April 26, 2024 05:47
domire8 added a commit to domire8/docker-images that referenced this pull request Apr 30, 2024
domire8 added a commit that referenced this pull request May 2, 2024
domire8 added a commit that referenced this pull request May 2, 2024
domire8 added a commit that referenced this pull request May 2, 2024
eeberhard added a commit that referenced this pull request May 10, 2024
eeberhard added a commit that referenced this pull request May 13, 2024
…s:iron (#109)

* Revert "feat: create ros2-ws image that has ros2-control installed (#107)"

This reverts commit a284a2d.

* Revert "Revert "refactor: merge ros2-control image into ros2-ws (#100)""

This reverts commit be10502.

* Revert "Revert "feat: add metadata through LABELs (#103)""

This reverts commit 5cea82c.

* Revert "Revert "fix: correct user (#105)""

This reverts commit 52d2b8a.

* fix: AICA image metadata base version as git tag, not ROS distro

* Change tech.aica.image.metadata base.version to use VERSION
(expected as semver vX.Y.Z-foo) instead of BASE_TAG (which was
equiavlent to ROS distro (i.e iron). Otherwise, package-builder:v1
will fail to parse the metadata since it expects the base version
as a semver string

* feat: use specific SH256 digest for iron base image (2023.09.02)

* Include more build args in Dockerfile to disambiguate ROS_DISTRO
from BASE_TAG and to support different BASE_IMAGE

* Update build push workflow to set new build args with condition
based on ROS distro

* Use specific SHA256 digest image and tag for ros:iron base image
based on a build from September 02, 2023

* feat: add devcontainer metadata

* Set default container user metadata for devcontainers
(https://containers.dev/implementors/reference/#labels)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants