move to using base image of python, not ubuntu, update requirements to use pip for as much as we can and not mix and match some apt get and pip3 for python dependencies

This commit is contained in:
2024-03-10 13:37:54 +11:00
parent 33c86f49fb
commit 096251f8ce
2 changed files with 7 additions and 19 deletions

View File

@@ -1,25 +1,13 @@
FROM ubuntu:22.04 FROM python:latest
WORKDIR /code WORKDIR /code
USER root
ENV PJM_UID=500 ENV PJM_UID=500
ENV PJM_GID=500 ENV PJM_GID=500
RUN groupadd -g ${PJM_GID} mythtv && useradd -r -u ${PJM_UID} -g ${PJM_GID} mythtv RUN groupadd -g ${PJM_GID} mythtv && useradd -r -u ${PJM_UID} -g ${PJM_GID} mythtv
ENV TZ=Australia/Melbourne RUN apt-get update && apt-get -y install libpq-dev mediainfo cmake libgl1-mesa-glx libglib2.0-0 libjpeg-turbo-progs ffmpeg git
RUN truncate -s0 /tmp/preseed.cfg && \ COPY . .
(echo "tzdata tzdata/Areas select Australia" >> /tmp/preseed.cfg) && \
(echo "tzdata tzdata/Zones/Australia select Melbourne" >> /tmp/preseed.cfg) && \
debconf-set-selections /tmp/preseed.cfg && \
rm -f /etc/timezone /etc/localtime && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
apt-get install -y tzdata
RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install python3-pip libpq-dev gunicorn mediainfo cmake libgl1-mesa-glx libglib2.0-0 python3-ldap libjpeg-turbo-progs ffmpeg git
COPY requirements.txt requirements.txt
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 443 EXPOSE 80
EXPOSE 55432
COPY . .
RUN echo $RANDOM | md5sum | head -c 30 > /code/.sk RUN echo $RANDOM | md5sum | head -c 30 > /code/.sk
RUN chmod 600 .sk RUN chmod 600 .sk
RUN date > internal/build-date.txt RUN date > internal/build-date.txt
@@ -30,6 +18,4 @@ RUN rm -rf .git
RUN chown mythtv:mythtv /code RUN chown mythtv:mythtv /code
RUN chown mythtv:mythtv ./static RUN chown mythtv:mythtv ./static
RUN chown mythtv:mythtv ./static/* RUN chown mythtv:mythtv ./static/*
## cleanup of files from setup
RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
CMD ["./wrapper.sh"] CMD ["./wrapper.sh"]

View File

@@ -1,4 +1,4 @@
flask flask==2.3.3
flask_login flask_login
flask-ldap3-login flask-ldap3-login
sqlalchemy sqlalchemy
@@ -19,3 +19,5 @@ Werkzeug
flask-compress flask-compress
ffmpeg-python ffmpeg-python
psycopg2 psycopg2
python3-ldap
gunicorn