From abf0a792cafa4023acec2e83757e9ecf102a1f10 Mon Sep 17 00:00:00 2001
From: Mathieu Strypsteen <mathieu@strypsteen.me>
Date: Mon, 13 Jan 2025 20:09:22 +0100
Subject: [PATCH] Revert forgejo-runner bug fix

---
 sandbox/etc/containers/containers.conf.d/sandbox.conf   | 2 --
 sandbox/etc/containers/systemd/browserless.container    | 1 -
 sandbox/etc/containers/systemd/code-server.container    | 1 -
 sandbox/etc/containers/systemd/forgejo-runner.container | 1 -
 4 files changed, 5 deletions(-)
 delete mode 100644 sandbox/etc/containers/containers.conf.d/sandbox.conf

diff --git a/sandbox/etc/containers/containers.conf.d/sandbox.conf b/sandbox/etc/containers/containers.conf.d/sandbox.conf
deleted file mode 100644
index 65f0f12..0000000
--- a/sandbox/etc/containers/containers.conf.d/sandbox.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[containers]
-userns="host"
diff --git a/sandbox/etc/containers/systemd/browserless.container b/sandbox/etc/containers/systemd/browserless.container
index 234f0f7..c54d8cb 100644
--- a/sandbox/etc/containers/systemd/browserless.container
+++ b/sandbox/etc/containers/systemd/browserless.container
@@ -1,6 +1,5 @@
 [Container]
 Image=ghcr.io/browserless/chromium
-UserNS=auto
 Tmpfs=/home/blessuser:mode=1777
 Environment=DEBUG=-*
 PublishPort=3000:3000
diff --git a/sandbox/etc/containers/systemd/code-server.container b/sandbox/etc/containers/systemd/code-server.container
index 9c0ec77..42dd387 100644
--- a/sandbox/etc/containers/systemd/code-server.container
+++ b/sandbox/etc/containers/systemd/code-server.container
@@ -1,6 +1,5 @@
 [Container]
 Image=git.strypsteen.com/infra/code-server
-UserNS=auto
 ReadOnly=false
 AddDevice=/dev/kvm
 AddDevice=/dev/net/tun
diff --git a/sandbox/etc/containers/systemd/forgejo-runner.container b/sandbox/etc/containers/systemd/forgejo-runner.container
index 5e72014..182f5e1 100644
--- a/sandbox/etc/containers/systemd/forgejo-runner.container
+++ b/sandbox/etc/containers/systemd/forgejo-runner.container
@@ -2,7 +2,6 @@
 Restart=on-failure
 [Container]
 Image=code.forgejo.org/forgejo/runner:6
-UserNS=auto
 SecurityLabelDisable=true
 Exec=forgejo-runner daemon -c /etc/forgejo-runner/config.yaml
 Volume=/run/podman:/run/podman:U