From e7d749ba224f7703dab305fb47efe2d9ba466262 Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Mon, 16 Sep 2024 21:51:02 -0700
Subject: [PATCH] client: docker-finance.d: Dockerfiles: cleanup, clarify

---
 .../dev-tools/Dockerfile.dev-tools.in         | 21 ++++++++++----
 .../finance/Dockerfile.archlinux.in           | 24 ++++++++++------
 .../Dockerfiles/finance/Dockerfile.ubuntu.in  | 28 +++++++++++++------
 3 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in b/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in
index 30a1d34..3f7ddba 100644
--- a/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in
+++ b/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in
@@ -16,17 +16,26 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 #
-# Custom (optional) Dockerfile - appends to existing Dockerfile
+# Custom (optional) Dockerfile
+#
+
+#
+# NOTE:
+#
+#   - Uncomment any block below, as needed
+#   - Or add your own custom Dockerfile commands here
+#   - This file appends to docker-finance's generated Dockerfile
 #
 
 USER root
-
 RUN apt-get update -y
 
-RUN apt-get install -y \
-  curl
+## Optional: networking
+#RUN apt-get install -y \
+#  curl
+
+## Add yours below, as needed
+
 
-USER @DOCKER_FINANCE_USER@
-WORKDIR /home/@DOCKER_FINANCE_USER@
 
 # vim: sw=2 sts=2 si ai et
diff --git a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in
index 787ae20..c4c9076 100644
--- a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in
+++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in
@@ -16,36 +16,44 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 #
-# Custom (optional) Dockerfile - appends to existing Dockerfile
+# Custom (optional) Dockerfile
 #
 
 #
-# Optional userspace
+# NOTE:
+#
+#   - Uncomment any block below, as needed
+#   - Or add your own custom Dockerfile commands here
+#   - This file appends to docker-finance's generated Dockerfile
 #
 
-#USER root
+USER root
+RUN pacman -Syu --noconfirm
 
+## Optional: finance-related
 #RUN pacman -Syu \
 #  calc \
 #  less \
 #  --noconfirm --disable-download-timeout
 
+## Optional: text editors
 #RUN pacman -Syu \
 #  emacs-nox \
 #  nano \
 #  --noconfirm --disable-download-timeout
 
-#
-# Optional userspace (python / ROOT.cern custom metadata analysis)
-#
-
+## Optional: python
 #RUN pacman -Syu \
 #  python-pipx \
 #  --noconfirm --disable-download-timeout
 
+## Optional: python: xlsx to csv conversion tool
 #USER @DOCKER_FINANCE_USER@
 #WORKDIR /home/@DOCKER_FINANCE_USER@
-
 #RUN pipx install xlsx2csv
 
+## Add yours below, as needed
+
+
+
 # vim: sw=2 sts=2 si ai et
diff --git a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in
index aa2fdc2..04ecfc2 100644
--- a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in
+++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in
@@ -16,30 +16,40 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 #
-# Custom (optional) Dockerfile - appends to existing Dockerfile
+# Custom (optional) Dockerfile
 #
 
 #
-# Optional userspace
+# NOTE:
+#
+#   - Uncomment any block below, as needed
+#   - Or add your own custom Dockerfile commands here
+#   - This file appends to docker-finance's generated Dockerfile
 #
 
-#USER root
-#RUN apt-get update -y
+USER root
+RUN apt-get update -y
+
+## Optional: finance-related
 #RUN apt-get install -y \
 #  calc \
+
+## Optional: text editors
+#RUN apt-get install -y \
 #  emacs-nox \
 #  nano
 
-#
-# Optional userspace (python)
-#
-
+## Optional: python
 #RUN apt-get install -y \
 #  pipx
 
+## Optional: python: xlsx to csv conversion tool
 #USER @DOCKER_FINANCE_USER@
 #WORKDIR /home/@DOCKER_FINANCE_USER@
-
 #RUN pipx install xlsx2csv
 
+## Add yours below, as needed
+
+
+
 # vim: sw=2 sts=2 si ai et