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

docs: Devcontainers-cli enhancement #2548

Merged
merged 11 commits into from
Oct 27, 2024
Merged

Conversation

Pauiii
Copy link
Contributor

@Pauiii Pauiii commented Oct 10, 2024

Documentation enhancement for local setup with the devcontainers-cli like mentioned on Discord.

  • Splitted Docker documentation into VSCode and Devcontainers CLI
  • Add overall Docker setup instruction
  • Adjust the Building & Flashing documentation by moving Docker related information into the Docker documentation

Additionally, I added a new volume for modules to the devcontainer.json, so that it can be used for building locally with external modules.

Pauiii added 5 commits October 9, 2024 22:15
…hes.

This includes adding a new dropdown for Docker which lists overall steps
that have to be done when setting up the environment. Furthermore, the
previous documentation is no listed under VSCode and new documentation
for the Devcontainer CLI has been added.
Moved information about creating volumes for Docker containers into the
overall Docker setup documentation. Add warning for changing build
directory or adding options for building at the top of the page.
@Pauiii Pauiii requested review from a team as code owners October 10, 2024 18:38
@caksoylar caksoylar added the documentation Improvements or additions to documentation label Oct 10, 2024
Copy link
Contributor

@Nick-Munnich Nick-Munnich left a comment

Choose a reason for hiding this comment

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

Hey, thanks for writing this! It looks pretty good, and I've been wanting someone to tackle this for a while. I have some larger thoughts listed below, more detailed pass pending them being addressed.

.devcontainer/devcontainer.json Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/build-flash.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/setup/docker/cli.md Outdated Show resolved Hide resolved
@Pauiii
Copy link
Contributor Author

Pauiii commented Oct 15, 2024

Hey, thanks for writing this! It looks pretty good, and I've been wanting someone to tackle this for a while. I have some larger thoughts listed below, more detailed pass pending them being addressed.

Thanks for the review! I will have a look at everything and try to make adjustments accordingly.

Since the described approaches for VS Code and Dev Container CLI varied
quiet a bit a more unified way of setting them up was added. Due to
that, the documentation for building and flashing could be simplified as
well.
Copy link
Contributor

@Nick-Munnich Nick-Munnich left a comment

Choose a reason for hiding this comment

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

Thanks for sticking with it, this looks pretty good! Some more minor comments this time.

Also, since it hasn't been linked yet, this closes #208

docs/docs/development/local-toolchain/build-flash.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/setup/container.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/setup/container.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/setup/container.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/setup/container.mdx Outdated Show resolved Hide resolved
Copy link
Contributor

@Nick-Munnich Nick-Munnich left a comment

Choose a reason for hiding this comment

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

Just some minor rephrasing.

docs/docs/development/local-toolchain/build-flash.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/build-flash.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/build-flash.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/build-flash.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/build-flash.mdx Outdated Show resolved Hide resolved
@Pauiii
Copy link
Contributor Author

Pauiii commented Oct 26, 2024

Just some minor rephrasing.

Sure, I adjusted everything.

Copy link
Contributor

@Nick-Munnich Nick-Munnich left a comment

Choose a reason for hiding this comment

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

LGTM, thanks again!

Copy link
Contributor

@caksoylar caksoylar left a comment

Choose a reason for hiding this comment

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

Thank you both for your work, looks good to me besides a few small things noted.

For future contributions, it'd be great if we can avoid reformatting lines in existing content. It adds a lot of noise to the diff for not much benefit.

docs/docs/development/local-toolchain/setup/container.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/build-flash.mdx Outdated Show resolved Hide resolved
docs/docs/development/local-toolchain/build-flash.mdx Outdated Show resolved Hide resolved
@@ -9,6 +9,7 @@
"mounts": [
"type=volume,source=zmk-root-user,target=/root",
"type=volume,source=zmk-config,target=/workspaces/zmk-config",
"type=volume,source=zmk-modules,target=/workspaces/zmk-modules",
Copy link
Contributor

Choose a reason for hiding this comment

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

Just a note: approving this change, from a container setup perspective. Will let the docs team handle final approval/merge of this PR though. Thanks!

@Nick-Munnich
Copy link
Contributor

For future contributions, it'd be great if we can avoid reformatting lines in existing content. It adds a lot of noise to the diff for not much benefit.

Just as a side note, I personally am in favor of reformatting such that each sentence begins on a new line in the file. This just makes it easier to review, imo.

@Pauiii
Copy link
Contributor Author

Pauiii commented Oct 27, 2024

Thank you both for your work, looks good to me besides a few small things noted.

For future contributions, it'd be great if we can avoid reformatting lines in existing content. It adds a lot of noise to the diff for not much benefit.

Applied everything you mentioned. Sure I will keep it in mind.

@Nick-Munnich Nick-Munnich merged commit cb5e605 into zmkfirmware:main Oct 27, 2024
7 checks passed
EnotionZ pushed a commit to EnotionZ/zmk that referenced this pull request Nov 6, 2024
* docs: Split local toolchain setup for Docker in two separated approaches.

This includes adding a new dropdown for Docker which lists overall steps
that have to be done when setting up the environment. Furthermore, the
previous documentation is no listed under VSCode and new documentation
for the Devcontainer CLI has been added.

Since the described approaches for VS Code and Dev Container CLI varied
quiet a bit a more unified way of setting them up was added. Due to
that, the documentation for building and flashing could be simplified as
well.

* docs: Update documentation for building and flashing for devcontainers.

Moved information about creating volumes for Docker containers into the
overall Docker setup documentation. Add warning for changing build
directory or adding options for building at the top of the page.

* feat(devcontainers): Add new volume for mounting modules.

---------

Co-authored-by: Nicolas Munnich <[email protected]>
earwin pushed a commit to earwin/zmk that referenced this pull request Nov 13, 2024
* docs: Split local toolchain setup for Docker in two separated approaches.

This includes adding a new dropdown for Docker which lists overall steps
that have to be done when setting up the environment. Furthermore, the
previous documentation is no listed under VSCode and new documentation
for the Devcontainer CLI has been added.

Since the described approaches for VS Code and Dev Container CLI varied
quiet a bit a more unified way of setting them up was added. Due to
that, the documentation for building and flashing could be simplified as
well.

* docs: Update documentation for building and flashing for devcontainers.

Moved information about creating volumes for Docker containers into the
overall Docker setup documentation. Add warning for changing build
directory or adding options for building at the top of the page.

* feat(devcontainers): Add new volume for mounting modules.

---------

Co-authored-by: Nicolas Munnich <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants