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

Cleaned up Docker pipelines #121

Merged
merged 7 commits into from
Oct 12, 2023
Merged

Conversation

evan-palmer
Copy link
Collaborator

Checklist

  • I have performed a thorough review of my code
  • I have sufficiently commented my code
  • The implementation follows the project style conventions
  • All project unit tests are passing
  • If relevant, documentation has been provided or updated to discuss the changes made
  • System integration tests were performed successfully

Changes Made

This PR cleans up the Dockerfile and updates the CI pipelines to support a new robot and desktop stage. The robot stage provides a minimal installation for use on a robot and is built to support the AMD64 and arm64 architectures. The desktop stage provides a complete installation that users can use to work with the project. docker-compose scripts have been added to make it easier to launch the desktop image.

Associated Issues

Testing

I've tested out the CD pipelines on both my desktop (NVIDIA drivers) and laptop (Nouveau drivers) and can confirm that the desktop image works on both. I've also tested out the updated devcontainer and that also works on both platforms.

@evan-palmer evan-palmer self-assigned this Oct 12, 2023
@evan-palmer evan-palmer linked an issue Oct 12, 2023 that may be closed by this pull request
.docker/Dockerfile Outdated Show resolved Hide resolved
.docker/compose/nouveau-compose.yaml Outdated Show resolved Hide resolved
.docker/compose/nvidia-compose.yaml Outdated Show resolved Hide resolved
@evan-palmer evan-palmer merged commit 11807c8 into main Oct 12, 2023
@evan-palmer evan-palmer deleted the 120-feature-cleanup-dockerfile branch October 12, 2023 22:49
@evan-palmer
Copy link
Collaborator Author

@mergify backport iron

@mergify
Copy link

mergify bot commented Oct 12, 2023

backport iron

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Oct 12, 2023
* Cleaned up Dockerfile and added new user entrypoints

* Fixed robot pipeline to support building for arm64

* Updated devcontainer configurations to use latest changes

* Testing pipelines

* Removed testing branch from pipelines

* Precommit

* Resolved pr comments

(cherry picked from commit 11807c8)

# Conflicts:
#	.devcontainer/nouveau/devcontainer.json
#	.devcontainer/nvidia/devcontainer.json
#	.github/ISSUE_TEMPLATE/config.yaml
#	.github/workflows/ci.yaml
@evan-palmer
Copy link
Collaborator Author

@mergify backport humble

@mergify
Copy link

mergify bot commented Oct 12, 2023

backport humble

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Oct 12, 2023
* Cleaned up Dockerfile and added new user entrypoints

* Fixed robot pipeline to support building for arm64

* Updated devcontainer configurations to use latest changes

* Testing pipelines

* Removed testing branch from pipelines

* Precommit

* Resolved pr comments

(cherry picked from commit 11807c8)

# Conflicts:
#	.devcontainer/nouveau/devcontainer.json
#	.devcontainer/nvidia/devcontainer.json
#	.github/ISSUE_TEMPLATE/config.yaml
#	.github/workflows/ci.yaml
evan-palmer added a commit that referenced this pull request Oct 12, 2023
* Cleaned up Docker pipelines (#121)

* Cleaned up Dockerfile and added new user entrypoints

* Fixed robot pipeline to support building for arm64

* Updated devcontainer configurations to use latest changes

* Testing pipelines

* Removed testing branch from pipelines

* Precommit

* Resolved pr comments

(cherry picked from commit 11807c8)

# Conflicts:
#	.devcontainer/nouveau/devcontainer.json
#	.devcontainer/nvidia/devcontainer.json
#	.github/ISSUE_TEMPLATE/config.yaml
#	.github/workflows/ci.yaml

* Fixed backport

* Fixed config merge conflict

---------

Co-authored-by: Evan Palmer <[email protected]>
evan-palmer added a commit that referenced this pull request Oct 12, 2023
* Cleaned up Docker pipelines (#121)

* Cleaned up Dockerfile and added new user entrypoints

* Fixed robot pipeline to support building for arm64

* Updated devcontainer configurations to use latest changes

* Testing pipelines

* Removed testing branch from pipelines

* Precommit

* Resolved pr comments

(cherry picked from commit 11807c8)

# Conflicts:
#	.devcontainer/nouveau/devcontainer.json
#	.devcontainer/nvidia/devcontainer.json
#	.github/ISSUE_TEMPLATE/config.yaml
#	.github/workflows/ci.yaml

* Fixed humble backport

* Fixed config merge conflict

---------

Co-authored-by: Evan Palmer <[email protected]>
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.

[FEATURE]: Cleanup Dockerfile
1 participant