From 7e9717edbbfaf54f8ec9847cdbffafe9461429e4 Mon Sep 17 00:00:00 2001
From: khakers <22665282+khakers@users.noreply.github.com>
Date: Sat, 16 Dec 2023 20:02:32 +0000
Subject: [PATCH] Revert "Renamed user from app to modmail"

This reverts commit 319000b6b4c5e4523cb0de4e2a57c1cbd6f383f8.
---
 Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 96a398fad45..2729a248262 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,18 +3,17 @@ FROM python:3.10 as py
 FROM py as build
 
 RUN apt update && apt install -y g++ git
-
 COPY requirements.txt /
 RUN pip install --prefix=/inst -U -r /requirements.txt
 
 FROM py
 
-COPY --from=build /inst /usr/local
-
 ENV USING_DOCKER yes
-RUN useradd --system --no-create-home modmail
-USER modmail
+COPY --from=build /inst /usr/local
 
 WORKDIR /modmailbot
 CMD ["python", "bot.py"]
-COPY --chown=modmail:modmail . /modmailbot
+COPY . /modmailbot
+RUN adduser --disabled-password --gecos '' app && \
+  chown -R app /modmailbot
+USER app