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.

Sign up for GitHub

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

feat: Pre dx devmode #2036

Open
wants to merge 5 commits into
base: testing
Choose a base branch
from
Open

feat: Pre dx devmode #2036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b1199d
added justfile for docker and vscode layers for gaming devs 😉 (pre -d…
mowglixx Dec 31, 2024
0c9f6d3
fixed formatting issue
mowglixx Dec 31, 2024
8e0e8ea
added socket activation as part of install-docker-ce
mowglixx Dec 31, 2024
ab4e2b8
added justfile to containerfile
mowglixx Jan 1, 2025
7d94599
escaped "$" chars in docker repo url and name
mowglixx Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,7 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
echo "import \"/usr/share/ublue-os/just/84-bazzite-virt.just\"" >> /usr/share/ublue-os/justfile && \
echo "import \"/usr/share/ublue-os/just/85-bazzite-image.just\"" >> /usr/share/ublue-os/justfile && \
echo "import \"/usr/share/ublue-os/just/86-bazzite-windows.just\"" >> /usr/share/ublue-os/justfile && \
echo "import \"/usr/share/ublue-os/just/87-bazzite-devcontainers.just\"" >> /usr/share/ublue-os/justfile && \
echo "import \"/usr/share/ublue-os/just/90-bazzite-de.just\"" >> /usr/share/ublue-os/justfile && \
if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
systemctl enable usr-share-sddm-themes.mount && \
Expand Down
34 changes: 34 additions & 0 deletions system_files/desktop/shared/usr/share/ublue-os/just/87-bazzite-devcontainers.just
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# vim: set ft=make :

# Install Docker, VS Code and add user to relevant groups for docker
install-visual-studio-code:
#!/usr/bin/bash
# check for updates
ublue-update --wait
# add yum repo
echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" | sudo tee /etc/yum.repos.d/vscode.repo > /dev/null
# install layer
rpm-ostree install -y code
echo 'Complete, please reboot to apply changes.'

install-docker-ce:
#!/usr/bin/bash
# check for updates
ublue-update --wait
# add yum repo
echo -e "[docker-ce-stable]\nname=Docker CE Stable - \$basearch\nbaseurl=https://download.docker.com/linux/fedora/\$releasever/\$basearch/stable\nenabled=1\ngpgcheck=1\ngpgkey=https://download.docker.com/linux/fedora/gpg" | sudo tee /etc/yum.repos.d/docker-ce.repo > /dev/null
# install the layer
rpm-ostree install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
# Enable the service
systemctl enable docker
# Enable the socket
systemctl enable docker.socket
echo 'Complete, please reboot to apply changes.'
mowglixx marked this conversation as resolved.
Show resolved Hide resolved

add-user-to-docker-group:
#!/usr/bin/bash
if ! grep -q "^docker:" /etc/group; then
grep '^docker:' /usr/lib/group | sudo tee -a /etc/group > /dev/null
Comment on lines +30 to +31
Copy link
Contributor

Choose a reason for hiding this comment

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

are regexp patterns enabled by default?

Suggested change
if ! grep -q "^docker:" /etc/group; then
grep '^docker:' /usr/lib/group | sudo tee -a /etc/group > /dev/null
if ! grep -qE "^docker:" /etc/group; then
grep -E '^docker:' /usr/lib/group | sudo tee -a /etc/group > /dev/null

Copy link
Author

Choose a reason for hiding this comment

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

I'm afraid that's a little outside my scope, I'm not super familiar with grep, copied this from working code in the input group justfile and changed the word from input to docker, I then added the : to stop dockerroot from being added to the users grouplist

Copy link
Author

Choose a reason for hiding this comment

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

Also, it worked 😅

fi
sudo usermod -aG docker $USER
echo 'Complete, please reboot/logout to apply changes.'