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

Add Docker BuildX config (backport #266) #268

Merged
merged 2 commits into from
Aug 22, 2024
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 22, 2024

Changes Made

Adds a .docker/docker-bake.hcl buildx bake configuration file. The default behavior is to pulls images from ghcr.io/robotic-decision-making-lab/blue to prime the cache, but only push to local cache.

Also updates the Github action to use buildx-bake. In CI it overrides the default config to cache to/from images in the Github package registry.

All docker images ('ci', 'robot', 'desktop' and 'desktop-nvidia') can be built with:

cd .docker && docker buildx bake

This is a standalone PR with the buildx config; very similar files are commited in the more complex #241. If merged, this will lead to a conflict in that PR which will need to be managed by hand.

Associated Issues

Related to #241

Testing

Above docker buildx bake call completes successfully. Resulting images for rolling are functional to complete joystick teleop demo.


This is an automatic backport of pull request #266 done by Mergify.

* Allow pushing to apl-ocean-engineering

* Install cppzmq-dev for Gazebo

* Allow pushing to apl-ocean-engineering

* Reverse change in docker.yaml action.

* Preliminary version of docker-bake.hcl and updated Docker workflow.

* Updated comments in Dockerfile

* Attempt to allow manual triggering of builds

* Nope, that's not it.

* Add preliminary label to all Docker images.

* Removed redundant libcppzmq-dev

* Hack to lowercase repo name

* Re-activate the metadata-action, go back to stages in matrix.

* Add comment on lowercasing.

* Place files config at correct level.

* Re-activate the metadata-action, go back to stages in matrix.

* Place files config at correct level.

* Switch to registry cache for CI

* Removed stage from matrix

* Update repo URL, fix list formatting.

(cherry picked from commit a8681d0)

# Conflicts:
#	.github/workflows/docker.yaml
Copy link
Author

mergify bot commented Aug 22, 2024

Cherry-pick of a8681d0 has failed:

On branch mergify/bp/iron/pr-266
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit a8681d0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .docker/docker-bake.hcl
	modified:   .gitignore

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/docker.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Aug 22, 2024
@evan-palmer
Copy link
Collaborator

This will fail until we backport #271

@evan-palmer evan-palmer merged commit 46bf8e0 into iron Aug 22, 2024
4 checks passed
@evan-palmer evan-palmer deleted the mergify/bp/iron/pr-266 branch August 22, 2024 21:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants