From 1bdf63b1b4f46bfb88fbe2423ac490cf2c7b52e1 Mon Sep 17 00:00:00 2001
From: phoenix <phoenix@sphinx>
Date: Thu, 17 Apr 2025 10:06:14 +0100
Subject: [PATCH] feat(buildah): optimize script by grouping run/config
 commands

---
 build-analytics-backend-workspace.sh | 57 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/build-analytics-backend-workspace.sh b/build-analytics-backend-workspace.sh
index 2a38d92..592eec2 100644
--- a/build-analytics-backend-workspace.sh
+++ b/build-analytics-backend-workspace.sh
@@ -10,33 +10,29 @@ DEV_HOME=/home/devuser
 
 ctr=$(buildah from registry.fedoraproject.org/fedora-minimal:40)
 
-buildah run "$ctr" -- microdnf update -y
-buildah run "$ctr" -- microdnf install -y \
-  neovim git zsh tmux podman openssh-server \
-  java-17-openjdk maven sudo shadow-utils gnupg attr &&
-  microdnf clean all
+buildah run "$ctr" -- bash -c "microdnf update -y &&
+  microdnf install -y &&
+  neovim git zsh tmux podman fzf fd ripgrep &&
+  java-17-openjdk maven shadow-utils gnupg attr &&
+  microdnf clean all &&
+  useradd -ms /bin/zsh devuser &&
+  echo 'devuser ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/devuser &&
+  mkdir -p $DEV_HOME/.gnupg $DEV_HOME/.git-credentials
+"
 
-buildah run "$ctr" -- useradd -ms /bin/zsh devuser
-buildah run "$ctr" -- bash -c 'echo "devuser ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/devuser'
+# copy ssh setup
+buildah copy "$ctr" ssh /"$SECURE"/ssh
 
-# SSH setup
-buildah run "$ctr" -- mkdir -p /"$SECURE"/ssh
-buildah copy "$ctr" ssh/config /"$SECURE"/ssh/config
-buildah copy "$ctr" ssh/ssh_blocker.sh /"$SECURE"/ssh/ssh_blocker.sh
-buildah run "$ctr" -- chmod 100 /"$SECURE"/ssh/ssh_blocker.sh
-buildah run "$ctr" -- chmod 000 /"$SECURE"/ssh/config
-buildah run "$ctr" -- chown -R root:root ssh/config /"$SECURE"/ssh_blocker.sh
-buildah run "$ctr" -- chattr -R +i /"$SECURE"/ssh
-
-# Neovim config (immutable)
-buildah copy "$ctr" config/nvim /home/devuser/.config/nvim
-buildah run "$ctr" -- chmod -R 600 /home/devuser/.config/nvim
+# copy neovim and tmux setup
+buildah copy "$ctr" config /home/devuser/.config
+buildah copy "$ctr" local /home/devuser/.local
 
 # zsh and tmux config (immutable)
-buildah copy "$ctr" ./zshrc /home/devuser/.zshrc
+buildah copy "$ctr" zshrc /home/devuser/.zshrc
+buildah run "$ctr" -- chmod -R 600 /home/devuser/.zshrc
 buildah run "$ctr" -- chattr +i /home/devuser/.zshrc
 buildah run "$ctr" -- bash -c 'echo "set -g mouse on" > /home/devuser/.tmux.conf'
-buildah run "$ctr" -- chattr +i /home/devuser/.tmux.conf
+buildah run "$ctr" -- chattr +i /home/devuser/.config/tmux/tmux.conf.local
 
 # Git config and secrets placeholder (immutable)
 buildah run "$ctr" -- mkdir -p /home/devuser/.gnupg /home/devuser/.git-credentials
@@ -45,16 +41,19 @@ buildah copy "$ctr" ./gpg-key.asc /home/devuser/.gnupg/gpg-key.asc
 buildah run "$ctr" -- chattr +i /home/devuser/.gitconfig
 buildah run "$ctr" -- chattr +i /home/devuser/.gnupg/gpg-key.asc
 
+# Neovim config (immutable)
+buildah run "$ctr" -- chmod -R 600 /home/devuser/.config/nvim
 buildah run "$ctr" -- chattr -R +i /home/devuser/.config
-buildah run "$ctr" -- chown -R devuser:devuser /home/devuser
-buildah run "$ctr" -- chattr -R +i /home/devuser
 
-buildah config --user devuser "$ctr"
-buildah config --workingdir /home/devuser "$ctr"
-buildah config --env CONTAINER_HOST=unix:///run/podman/podman.sock "$ctr"
-buildah config --env GIT_SSH=/usr/local/bin/git-ssh-wrapper.sh "$ctr"
-buildah config --port 22 "$ctr"
-buildah config --cmd "/home/devuser/start.sh" "$ctr"
+buildah run "$ctr" -- chown -R devuser:devuser /home/devuser
+
+buildah config \
+  --user devuser \
+  --workingdir /home/devuser \
+  --env CONTAINER_HOST=unix:///run/podman/podman.sock \
+  --env GIT_SSH=/usr/local/bin/git-ssh-wrapper.sh \
+  --cmd '["/home/devuser/start.sh"]' \
+  "$ctr"
 
 buildah commit "$ctr" $IMG_NAME