From 46ff2edef98e732d52158c18bc8d9ca894f733df Mon Sep 17 00:00:00 2001
From: Job79 <job@plabble.org>
Date: Thu, 16 Oct 2025 17:39:04 +0200
Subject: [PATCH] refactor: re-add container user

---
 containers/base/Containerfile  | 16 +++++++++++-----
 containers/go/Containerfile    |  2 ++
 containers/infra/Containerfile |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/containers/base/Containerfile b/containers/base/Containerfile
index 5c80ef2..34b5c07 100644
--- a/containers/base/Containerfile
+++ b/containers/base/Containerfile
@@ -7,10 +7,16 @@ RUN dnf update -y && \
     host-spawn dbus-launch \
     zoxide git npm neovim awk jq unzip fd-find chafa lazygit
 
-WORKDIR /root
-RUN mkdir -p .config .local .cache /run/user/0
+# === setup user ===
+RUN useradd -ms /bin/bash user && \
+  usermod -aG wheel user && sed -i '/NOPASSWD/s/^#//g' /etc/sudoers && \
+  mkdir -p /run/user/1000 && chown user:user /run/user/1000
+
+USER user
+WORKDIR /home/user
+RUN mkdir .config .local .cache
 RUN git clone https://git.plabble.org/Job79/neovim-config.git .config/nvim
-COPY config/bashrc .bashrc
-COPY config/git .config/git/config
+COPY --chown=user:user config/bashrc .bashrc
+COPY --chown=user:user config/git .config/git/config
 COPY config/bin /usr/local/bin
-VOLUME /root
+VOLUME /home/user
diff --git a/containers/go/Containerfile b/containers/go/Containerfile
index 9a1257c..cc2a2c7 100644
--- a/containers/go/Containerfile
+++ b/containers/go/Containerfile
@@ -1,2 +1,4 @@
 FROM git.plabble.org/job79/base:latest
+USER root
 RUN dnf -y install go
+USER user
diff --git a/containers/infra/Containerfile b/containers/infra/Containerfile
index 8564ac2..2877159 100644
--- a/containers/infra/Containerfile
+++ b/containers/infra/Containerfile
@@ -1,2 +1,4 @@
 FROM git.plabble.org/job79/base:latest
+USER root
 RUN dnf -y install kubectl
+USER user