Merge pull request #66 from ublue-os/m2giles-match-distrobox-create-d

chore: make distrobox quadlets match dryrun
ublue-os · Feb 14, 2024 · cb5d246 · cb5d246
2 parents 4c63114 + ce81cb1
commit cb5d246
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 32 deletions.
diff --git a/quadlets/bluefin-cli/bluefin-cli.container b/quadlets/bluefin-cli/bluefin-cli.container
@@ -7,19 +7,16 @@ AutoUpdate=registry
 ContainerName=bluefin
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/bluefin-cli:latest
 HostName=bluefin.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
-PodmanArgs=--label manager=distrobox
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
 Ulimit=host

diff --git a/quadlets/bluefin-cli/bluefin-dx-cli.container b/quadlets/bluefin-cli/bluefin-dx-cli.container
@@ -7,19 +7,16 @@ AutoUpdate=registry
 ContainerName=bluefin
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/bluefin-dx-cli:latest
 HostName=bluefin-dx.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
-PodmanArgs=--label manager=distrobox
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
 Ulimit=host

diff --git a/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container b/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container
@@ -7,19 +7,15 @@ AutoUpdate=registry
 ContainerName=fedora-distrobox-quadlet
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/fedora-toolbox:latest
 HostName=fedora-toolbox.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--label com.github.containers.toolbox=true
-PodmanArgs=--label manager=distrobox
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined

diff --git a/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container b/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container
@@ -7,19 +7,15 @@ AutoUpdate=registry
 ContainerName=ubuntu-distrobox-quadlet
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/ubuntu-toolbox:latest
 HostName=ubuntu-toolbox.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--label com.github.containers.toolbox=true
-PodmanArgs=--label manager=distrobox
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined

diff --git a/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container b/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container
@@ -7,19 +7,16 @@ AutoUpdate=registry
 ContainerName=wolfi-quadlet
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/wolfi-toolbox:latest
 HostName=wolfi-quadlet.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
-PodmanArgs=--label manager=distrobox
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
 Ulimit=host

diff --git a/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container b/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container
@@ -7,19 +7,16 @@ AutoUpdate=registry
 ContainerName=wolfi-quadlet
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/wolfi-dx-toolbox:latest
 HostName=wolfi-quadlet.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
-PodmanArgs=--label manager=distrobox
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
 Ulimit=host