Skip to content

Commit

Permalink
fix: podmansh improvements (#424)
Browse files Browse the repository at this point in the history
Co-authored-by: Jorge O. Castro <jorge.castro@gmail.com>
Co-authored-by: bobslept <38557801+bobslept@users.noreply.github.com>
  • Loading branch information
3 people committed Aug 18, 2023
1 parent 8d9ff43 commit 5bb88e4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 2 additions & 0 deletions toolboxes/Containerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ RUN ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree

RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
2 changes: 1 addition & 1 deletion usr/share/ublue-os/just/custom.just
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ podmansh:
podman pull ghcr.io/ublue-os/ubuntu-toolbox:latest

systemctl --user daemon-reload
systemctl --user stop podmansh.service
systemctl --user start podmansh.service
echo "Shell now switched to podmansh. Spawn a new terminal to get going!"
echo "By default, the shell will be Bash. To override it, create ~/.profile with your preferred shell"
Expand All @@ -169,7 +170,6 @@ podmansh-switch IMAGE:
systemctl --user start podmansh.service
echo "Image now switched to {{IMAGE}}"

# Install better touch-friendly GNOME extensions
touch:
pip install --upgrade gnome-extensions-cli
gext install improvedosk@nick-shmyrev.dev
Expand Down
10 changes: 8 additions & 2 deletions usr/share/ublue-os/quadlets/podmansh.container
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ Volume=/:/run/host:rslave
Volume=/dev:/dev:rslave
Volume=/sys:/sys:rslave
Volume=/tmp:/tmp:rslave
Volume=/etc/passwd:/etc/passwd:rslave
Volume=/etc/passwd-:/etc/passwd-:rslave
Volume=/etc/group:/etc/group:rslave
Volume=/etc/group-:/etc/group-:rslave
Volume=/tmp:/tmp:rslave
Volume=/sys/fs/selinux
Volume=/etc/selinux:/etc/selinux:rslave
Volume=/var/log/journal
Volume=/run/user/1000:/run/user/1000:rslave
Volume=/run/user/%U:/run/user/%U:rslave
Volume=/etc/hosts:/etc/hosts:ro
Volume=/etc/resolv.conf:/etc/resolv.conf:ro

Expand All @@ -29,7 +35,7 @@ Environment=ENV=%h/.profile
PodmanArgs=--env-host
PodmanArgs=--privileged
PodmanArgs=--mount=type=devpts,destination=/dev/pts
PodmanArgs=--userns=keep-id
PodmanArgs=--userns=host
PodmanArgs=--ulimit=host
PodmanArgs=--security-opt=label=disable
PodmanArgs=--cgroupns=private
Expand Down

0 comments on commit 5bb88e4

Please sign in to comment.