From b86d592cf689b15bf3262e24fd4f6f164df3333f Mon Sep 17 00:00:00 2001
From: Pat Garrity <pfm@garrity.co>
Date: Sat, 23 Mar 2024 23:04:33 -0500
Subject: [PATCH] Updating the image to perform some cleanup.

---
 Containerfile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Containerfile b/Containerfile
index 73e79a4..e403ec0 100644
--- a/Containerfile
+++ b/Containerfile
@@ -5,21 +5,16 @@ ENV SCALA_VERSION ${SCALA_VERSION:-3.4.0}
 ARG SBT_VERSION
 ENV SBT_VERSION ${SBT_VERSION:-1.9.9}
 
-# git is required for checkout
+# git and node are required for checkout
 # python3 is required for pre-commit
-# node is required for Forgejo checkout
-#RUN apk add curl bash git docker python3 py3-pip nodejs npm
+# docker is required for certain DinD cases
 RUN apt-get update
 RUN apt-get install -y curl git docker python3 python3-pip nodejs
-
-# On Alpine, must include --break-system-packages
-RUN pip3 install pre-commit #--break-system-packages
+RUN pip3 install pre-commit
 
 # Create the user - builds do not run as root.
-#RUN addgroup -S -g 1000 builder
-#RUN adduser -S -h /home/builder -s /bin/bash -G builder -u 1000 builder
 RUN groupadd -g 1111 -r builder
-RUN useradd -u 1111 -m -g 1111 -r builder
+RUN useradd -u 1111 -m -g 1111 -r -s /bin/bash builder
 
 # Switch to the build user. Everything else is installed at this level.
 USER builder