From e52756e161eba33fb17f0a491444122d5a89fa9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mar=C3=ADa=20a=2E=20matienzo?= <matienzo@berkeley.edu>
Date: Thu, 5 Jun 2025 15:11:06 -0700
Subject: [PATCH 1/2] Run dvuploader under dvtools:dpgdil

---
 Dockerfile | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 48c4521..da9506a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,24 @@
 FROM python:3.13-slim
 WORKDIR /opt/app
 
+ENV APP_USER=dvtools
+ENV APP_UID=40088
+
+ENV APP_GROUP=dpgdil
+ENV APP_GID=105
+
+RUN groupadd --system --gid $APP_UID $APP_USER \
+    && groupadd --system --gid $APP_GID $APP_GROUP \
+    && useradd --home-dir /opt/app --system --uid $APP_UID --gid $APP_USER -G $APP_GROUP $APP_USER
+
+RUN chown -R $APP_USER:$APP_USER /opt/app
+
+USER $APP_USER:$APP_GROUP
+
 # Install python-dvuploader dependencies
-COPY requirements.txt .
+COPY --chown=$APP_USER requirements.txt .
 RUN pip install -r requirements.txt
 
-ENTRYPOINT [ "dvuploader" ]
\ No newline at end of file
+ENV PATH="/opt/app/.local/bin:$PATH"
+
+ENTRYPOINT [ "dvuploader" ]

From 0b687789e830112e473fa47c4c012f29908d28be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mar=C3=ADa=20a=2E=20matienzo?=
 <73732+anarchivist@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:36:34 -0700
Subject: [PATCH 2/2] prefer $APP_UID for user's default gid

Co-authored-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index da9506a..d1a8868 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV APP_GID=105
 
 RUN groupadd --system --gid $APP_UID $APP_USER \
     && groupadd --system --gid $APP_GID $APP_GROUP \
-    && useradd --home-dir /opt/app --system --uid $APP_UID --gid $APP_USER -G $APP_GROUP $APP_USER
+    && useradd --home-dir /opt/app --system --uid $APP_UID --gid $APP_UID -G $APP_GROUP $APP_USER
 
 RUN chown -R $APP_USER:$APP_USER /opt/app