diff --git a/.dockerignore b/.dockerignore index 6a2626f..55963de 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,3 @@ -.git DB_BACKUP images_to_process new_img_dir diff --git a/BUGs b/BUGs index 4d48585..a1d2340 100644 --- a/BUGs +++ b/BUGs @@ -1,4 +1,4 @@ -### Next: 109 +### Next: 112 BUG-100: I managed to get 2 photos matching mich in the NOT_WORKING photo (probably dif refimgs but same p.tag?) = /photos/2012/20120414-damien/IMG_8467.JPG BUG-105: show unmatched needs to handle overrides (ignore face, etc.) @@ -9,3 +9,5 @@ BUG-109: add mich force override, removed it, then re-added it, then rebuild DB - this is actually only? possible if we restart job_mgr before its processed the metadata job(s) -- as the initialisation processes the metadata on the file system, and then presumably the delete of the metadata will come as the next job to run... NEED TO CONSIDER => better to defend the duplicate on load, OR, process all meta jobs before processing meta on FS OR both??? + +BUG-111: can't install git to container, it changes the python version and then gunicorn dies... THINK I need to try a newer base Ubuntu and see if gunicorn will just die, also fix the deprecation warning around FLASK_ENV diff --git a/Dockerfile b/Dockerfile index 5af6519..48a4e22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,14 +15,16 @@ RUN truncate -s0 /tmp/preseed.cfg && \ apt-get install -y tzdata ## cleanup of files from setup RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN apt-get update && apt-get -y install python3-pip python3-psycopg2 libpq-dev gunicorn mediainfo cmake libgl1-mesa-glx libglib2.0-0 python3-ldap libjpeg-turbo-progs ffmpeg git +RUN apt-get update && apt-get -y install python3-pip python3-psycopg2 libpq-dev gunicorn mediainfo cmake libgl1-mesa-glx libglib2.0-0 python3-ldap libjpeg-turbo-progs ffmpeg COPY requirements.txt requirements.txt RUN pip3 install -r requirements.txt RUN pip3 install --upgrade pillow --user EXPOSE 443 EXPOSE 55432 COPY . . -RUN git log -n 5 > ./internal/git-log.txt +#RUN git log -n 5 > ./internal/git-log.txt +#RUN apt-get -y purge git +RUN rm -rf .git RUN chown mythtv:mythtv /code RUN chown mythtv:mythtv ./static RUN chown mythtv:mythtv ./static/*