Robotic-Decision-Making-Lab / blue

ROS 2 platform for underwater robotics research and development.
https://robotic-decision-making-lab.github.io/blue/
MIT License
40 stars 9 forks source link

Cleaned up Docker pipelines (backport #121) #122

Closed mergify[bot] closed 8 months ago

mergify[bot] commented 8 months ago

This is an automatic backport of pull request #121 done by Mergify. Cherry-pick of 11807c8e7e5a19faf4b136d9b8c35458338a0fe9 has failed:

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

You are currently cherry-picking commit 11807c8.
  (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:   .devcontainer/nouveau/Dockerfile
    new file:   .devcontainer/nvidia/Dockerfile
    modified:   .docker/Dockerfile
    new file:   .docker/compose/nouveau-desktop.yaml
    new file:   .docker/compose/nvidia-desktop.yaml
    deleted:    .docker/entrypoints/dev.sh
    modified:   .docker/entrypoints/sim.sh
    modified:   .dockerignore
    modified:   .github/workflows/docker.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .devcontainer/nouveau/devcontainer.json
    both modified:   .devcontainer/nvidia/devcontainer.json
    both modified:   .github/ISSUE_TEMPLATE/config.yaml
    both modified:   .github/workflows/ci.yaml

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


Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com