feat: cleanup containers

This commit is contained in:
AngeD 2023-09-11 09:33:55 +02:00
parent 8cac5c8d2d
commit 0225077d38
15 changed files with 62 additions and 41 deletions

View File

@ -0,0 +1,6 @@
-- variables
vim.opt_local.shiftwidth = 2
vim.opt_local.tabstop = 2
vim.opt_local.listchars = vim.o.listchars .. ",leadmultispace:│ "
-- keybindings

@ -1 +1 @@
Subproject commit dd11ba7b3c8f82d51b6d4dd7d68fce2d78bf78a0 Subproject commit d177ad277a638f262edb73c75ffe33e377b95dc5

@ -1 +1 @@
Subproject commit cae5fdf035ee92c407a29ee2ccfcff503d2be7f1 Subproject commit dac8c39812dae025255c9069a260e1f69d967927

@ -1 +1 @@
Subproject commit 267282a9ce242bbb0c5dc31445b6d353bed978bb Subproject commit 0232372b906f275f76ac42029eba25eaf95e76b9

@ -1 +1 @@
Subproject commit 47c755d737702df7a39b640c8d9c473a728be1df Subproject commit a19770625aed49ad2a9f591a5e3946707f7359f6

@ -1 +1 @@
Subproject commit 4115fad9fded72571bdc3e0f7351e64b31799a3d Subproject commit 96a50241987531fdb8a516998b72c19f563ccd6c

View File

@ -1,3 +1,6 @@
ln -sf "$(mktemp -d chromiumconfigXXX)" "$XDG_CACHE_HOME/chromium"
ln -sf "$(mktemp -d chromiumcacheXXXX)" "$XDG_CONFIG_HOME/chromium"
if [ "$XDG_VTNR" = 1 ]; then if [ "$XDG_VTNR" = 1 ]; then
GUILOG="$HOME/.local/share/gui.log" GUILOG="$HOME/.local/share/gui.log"

@ -1 +1 @@
Subproject commit 932954a8b1e31ae540e9df5e5e464100d46e53ec Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7

@ -1 +1 @@
Subproject commit 7d5e12500a2ba0b575ffafcbb516568973528730 Subproject commit cd18bce53e01d0f614ffcbb7429053fb508cb095

View File

@ -1,15 +1,25 @@
#!/bin/bash -e #!/bin/bash -e
if grep -q 'Arch' /etc/os-release; then
unset DBUS_SESSION_BUS_ADDRESS
fi
if [ -z "$WAYLAND_DISPLAY" ]; then
CRI_OPT+=(
--network host
-e XAUTHORITY=/app/.Xauthority
-v "$XAUTHORITY:/app/.Xauthority:ro"
)
fi
CRI=(podman) CRI=(podman)
"${CRI[@]}" run --rm --name gui \ "${CRI[@]}" run --rm --name gui \
--userns=keep-id \
--device /dev/dri/ \ --device /dev/dri/ \
-e DISPLAY \ -e DISPLAY \
-e XDG_RUNTIME_DIR \ -e XDG_RUNTIME_DIR \
-v /dev/shm/:/dev/shm/ \
-v /tmp/.X11-unix/:/tmp/.X11-unix/ \ -v /tmp/.X11-unix/:/tmp/.X11-unix/ \
-v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-v home:/app/ \ -v home:/app/ \
-it \ git.maby.dev/ange/docker-gui:0.1
git.maby.dev/ange/docker-gui:0.1 \
bash

View File

@ -1,20 +1,29 @@
#!/bin/bash -e #!/bin/bash -e
DBUS_SESSION_BUS_ADDRESS= if grep -q 'Arch' /etc/os-release; then
unset DBUS_SESSION_BUS_ADDRESS
fi
if [ -z "$WAYLAND_DISPLAY" ]; then
CRI_OPT+=(
--network host
-e XAUTHORITY=/app/.Xauthority
-v "$XAUTHORITY:/app/.Xauthority:ro"
)
fi
CRI=(podman) CRI=(podman)
mkdir -p "$HOME/GUI/lutris/" HOMEDIR="$HOME/.local/state/docker-gui/lutris"
mkdir -p "$HOMEDIR"
"${CRI[@]}" run --rm --name lutris \ "${CRI[@]}" run --rm --name lutris \
--network host \ "${CRI_OPT[@]}" \
--userns=keep-id \ --userns=keep-id \
--device /dev/dri/ \ --device /dev/dri/ \
-e DISPLAY \ -e DISPLAY \
-e XDG_RUNTIME_DIR \ -e XDG_RUNTIME_DIR \
-e XAUTHORITY=/app/.Xauthority \
-v /dev/shm/:/dev/shm/ \
-v /tmp/.X11-unix/:/tmp/.X11-unix/ \ -v /tmp/.X11-unix/:/tmp/.X11-unix/ \
-v "$XAUTHORITY:/app/.Xauthority:ro" \
-v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-v "$HOME/GUI/lutris/:/app/" \ -v "$HOMEDIR:/app/" \
git.maby.dev/ange/docker-lutris:0.1 git.maby.dev/ange/docker-lutris:0.1

View File

@ -1,20 +1,29 @@
#!/bin/bash -e #!/bin/bash -e
DBUS_SESSION_BUS_ADDRESS= if grep -q 'Arch' /etc/os-release; then
unset DBUS_SESSION_BUS_ADDRESS
fi
if [ -z "$WAYLAND_DISPLAY" ]; then
CRI_OPT+=(
--network host
-e XAUTHORITY=/app/.Xauthority
-v "$XAUTHORITY:/app/.Xauthority:ro"
)
fi
CRI=(podman) CRI=(podman)
mkdir -p "$HOME/GUI/minecraft/" HOMEDIR="$HOME/.local/state/GUI/minecraft"
mkdir -p "$HOMEDIR"
"${CRI[@]}" run --rm --name minecraft \ "${CRI[@]}" run --rm --name minecraft \
--network host \ "${CRI_OPT[@]}" \
--userns=keep-id \ --userns=keep-id \
--device /dev/dri/ \ --device /dev/dri/ \
-e DISPLAY \ -e DISPLAY \
-e XDG_RUNTIME_DIR \ -e XDG_RUNTIME_DIR \
-e XAUTHORITY=/app/.Xauthority \
-v /dev/shm/:/dev/shm/ \
-v /tmp/.X11-unix/:/tmp/.X11-unix/ \ -v /tmp/.X11-unix/:/tmp/.X11-unix/ \
-v "$XAUTHORITY:/app/.Xauthority:ro" \
-v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \ -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-v "$HOME/GUI/minecraft/:/app/" \ -v "$HOMEDIR:/app/" \
git.maby.dev/ange/docker-minecraft:0.1 git.maby.dev/ange/docker-minecraft:0.1

View File

@ -1,16 +0,0 @@
#!/bin/bash -e
CRI=(podman)
mkdir -p /tmp/torbrowser/
"${CRI[@]}" run --rm --name torbrowser \
--userns=keep-id \
--device /dev/dri/ \
-e DISPLAY \
-e XDG_RUNTIME_DIR \
-v /dev/shm/:/dev/shm/ \
-v /tmp/.X11-unix/:/tmp/.X11-unix/ \
-v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-v "/tmp/torbrowser/:/app/" \
git.maby.dev/ange/docker-torbrowser:0.1