-
Notifications
You must be signed in to change notification settings - Fork 3
devenv: Make init script more robust for devpod environments #92
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
base: main
Are you sure you want to change the base?
Conversation
Summary of ChangesHello @cgwalters, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request enhances the Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request significantly improves the robustness of the devenv-init.sh script by making its operations conditional and less prone to failure in different environments like devpod. The changes, such as checking for file existence before modification and using a more reliable method to check mount propagation, are excellent. The addition of tmux to the common packages is also a useful enhancement. My review includes a couple of minor suggestions for the shell script to improve consistency and efficiency.
devenv/devenv-init.sh
Outdated
| # or we may not have permission to remount it. | ||
| propagation=$(findmnt -J -o TARGET,PROPAGATION / | jq -r '.filesystems[0].propagation // "unknown"') | ||
| if [ "$propagation" = "private" ]; then | ||
| if sudo mount -o remount --make-shared / 2>/dev/null; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The common/.devcontainer/devcontainer.json file specifies that this script is executed with sudo, meaning the entire script runs with root privileges. Therefore, the sudo command here is redundant. For consistency and clarity, it's better to rely on the script being invoked with sudo and remove sudo from within the script. Note that other commands in this script that require root privileges, like chmod and sed, are also called without an explicit sudo.
| if sudo mount -o remount --make-shared / 2>/dev/null; then | |
| if mount -o remount --make-shared / 2>/dev/null; then |
devenv/devenv-init.sh
Outdated
| sed -i -e 's,^#cgroups =.*,cgroups = "no-conmon",' /usr/share/containers/containers.conf | ||
| sed -i -e 's,^#cgroup_manager =.*,cgroup_manager = "cgroupfs",' /usr/share/containers/containers.conf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These two sed commands can be combined into a single command. This is slightly more efficient as it only reads from and writes to the file once, and can be considered a bit cleaner.
| sed -i -e 's,^#cgroups =.*,cgroups = "no-conmon",' /usr/share/containers/containers.conf | |
| sed -i -e 's,^#cgroup_manager =.*,cgroup_manager = "cgroupfs",' /usr/share/containers/containers.conf | |
| sed -i -e 's,^#cgroups =.*,cgroups = "no-conmon",' -e 's,^#cgroup_manager =.*,cgroup_manager = "cgroupfs",' /usr/share/containers/containers.conf |
The remount --make-shared / only works in codespaces which have specific Docker privileges. In devpod with rootless podman, the root filesystem may already have shared propagation or we may not have permission to remount. Use findmnt -J with jq for proper JSON parsing instead of string grep. Also add guards for: - /dev/kvm which may not exist in all environments - /usr/share/containers/containers.conf which may not exist Additionally, add tmux to common packages (used by devaipod's tmux command for split-view agent+shell sessions). Assisted-by: OpenCode (Claude sonnet-4-20250514) Signed-off-by: Colin Walters <walters@verbum.org>
gursewak1997
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lgtm
The remount --make-shared / only works in codespaces which have specific Docker privileges. In devpod with rootless podman, the root filesystem may already have shared propagation or we may not have permission to remount.
Use findmnt -J with jq for proper JSON parsing instead of string grep.
Also add guards for:
Additionally, add tmux to common packages (used by devaipod's tmux command for split-view agent+shell sessions).
Assisted-by: OpenCode (Claude sonnet-4-20250514)