From 75d9fb2dc7a51b62f0a8a947547b7107d3b64a59 Mon Sep 17 00:00:00 2001
From: Deka Jello <dekarrin.irl@gmail.com>
Date: Thu, 18 Apr 2024 10:46:58 -0500
Subject: [PATCH] Restore dev env convenience changes

---
 server/Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/Dockerfile b/server/Dockerfile
index ee6c9505..5001a48f 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -33,7 +33,8 @@ RUN pip3 install --no-cache-dir --disable-pip-version-check \
         "pillow-avif-plugin~=1.1.0"
 RUN apk --no-cache del py3-pip
 
-
+COPY ./ /opt/app/
+RUN rm -rf /opt/app/szurubooru/tests
 
 
 FROM --platform=$BUILDPLATFORM prereqs as testing
@@ -72,14 +73,16 @@ RUN apk --no-cache add \
         py3-waitress \
  && mkdir -p /opt/app /data \
  && addgroup -g ${PGID} app \
- && adduser -SDH -h /opt/app -g '' -G app -u ${PUID} app
+ && adduser -SDH -h /opt/app -g '' -G app -u ${PUID} app \
+ && chown -R app:app /opt/app /data
 
 # TODO: put this back when done modifying things
 COPY ./ /opt/app/
 
-RUN chown -R app:app /opt/app /data
-
 USER app
+
+# TODO: put this back when done modifying things
+COPY ./ /opt/app/
 CMD ["/opt/app/docker-start.sh"]
 
 ARG PORT=6666