From 8157292df4e460eeecbbca0ef0f4786f78401fea Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Sat, 7 Dec 2024 19:41:32 +1100 Subject: [PATCH] convert over to pauser - and use ARG for uid/gid of pauser --- Dockerfile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3b2590d..a37de5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,11 @@ FROM python:latest + +# declare var +ARG PA_ID + WORKDIR /code -ENV PJM_UID=500 -ENV PJM_GID=500 -RUN groupadd -g ${PJM_GID} mythtv && useradd -r -u ${PJM_UID} -g ${PJM_GID} mythtv +RUN groupadd -g ${PA_ID} pauser && useradd -r -u ${PA_ID} -g ${PA_ID} pauser + # sudo used in dev container RUN apt-get update && apt-get -y install libpq-dev mediainfo cmake libgl1-mesa-glx libglib2.0-0 libjpeg-turbo-progs ffmpeg git sudo COPY . . @@ -13,6 +16,7 @@ RUN mkdir -p static/Bin RUN mkdir -p static/Import RUN mkdir -p static/Storage RUN mkdir -p static/Metadata +RUN pip3 install --upgrade pip RUN pip3 install -r requirements.txt RUN pip3 install --upgrade pillow --user EXPOSE 80 @@ -23,7 +27,8 @@ RUN git log -n 15 > internal/git-log.txt RUN ln -s /code/TODO /code/internal/TODO RUN ln -s /code/BUGs /code/internal/BUGs RUN rm -rf .git -RUN chown mythtv:mythtv /code -RUN chown mythtv:mythtv ./static -RUN chown mythtv:mythtv ./static/* +RUN chown pauser:pauser /code +RUN chown pauser:pauser ./static +RUN chown pauser:pauser ./static/* + CMD ["./wrapper.sh"]