ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert over to pauser - and use ARG for uid/gid of pauser

Browse Source
This commit is contained in:
Damien De Paoli
2024-12-07 19:41:32 +11:00
parent a0b4b80ca9
commit 8157292df4
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@@ -1,8 +1,11 @@
FROM python:latest FROM python:latest
# declare var
ARG PA_ID
WORKDIR /code WORKDIR /code
ENV PJM_UID=500 RUN groupadd -g ${PA_ID} pauser && useradd -r -u ${PA_ID} -g ${PA_ID} pauser
ENV PJM_GID=500
RUN groupadd -g ${PJM_GID} mythtv && useradd -r -u ${PJM_UID} -g ${PJM_GID} mythtv
# sudo used in dev container # 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 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 . . COPY . .
@@ -13,6 +16,7 @@ RUN mkdir -p static/Bin
RUN mkdir -p static/Import RUN mkdir -p static/Import
RUN mkdir -p static/Storage RUN mkdir -p static/Storage
RUN mkdir -p static/Metadata RUN mkdir -p static/Metadata
RUN pip3 install --upgrade pip
RUN pip3 install -r requirements.txt RUN pip3 install -r requirements.txt
RUN pip3 install --upgrade pillow --user RUN pip3 install --upgrade pillow --user
EXPOSE 80 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/TODO /code/internal/TODO
RUN ln -s /code/BUGs /code/internal/BUGs RUN ln -s /code/BUGs /code/internal/BUGs
RUN rm -rf .git RUN rm -rf .git
RUN chown mythtv:mythtv /code RUN chown pauser:pauser /code
RUN chown mythtv:mythtv ./static RUN chown pauser:pauser ./static
RUN chown mythtv:mythtv ./static/* RUN chown pauser:pauser ./static/*
CMD ["./wrapper.sh"] CMD ["./wrapper.sh"]