diff --git a/backend/Dockerfile b/backend/Dockerfile index 2bf554f98c62dfbbd1de4bf8a4a7138aaa1571bd..27ee5e64cf348e02584c64eeca5d175075ef0cb9 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -54,9 +54,12 @@ RUN wget ${VIPSURL}/v${VIPSVERSION}/vips-${VIPSVERSION}.tar.gz \ # pre trained models download WORKDIR /data_models RUN mkdir -p /root/.cache/torch/hub/checkpoints/ -RUN curl -SL -k https://github.com/LibrePhotos/librephotos-docker/releases/download/0.1/places365.tar.gz | tar -zxC /data_models/ -RUN curl -SL -k https://github.com/LibrePhotos/librephotos-docker/releases/download/0.1/im2txt.tar.gz | tar -zxC /data_models/ -RUN curl -SL -k https://download.pytorch.org/models/resnet152-b121ed2d.pth -o /root/.cache/torch/hub/checkpoints/resnet152-b121ed2d.pth + +RUN curl -SL https://github.com/LibrePhotos/librephotos-docker/releases/download/0.1/places365.tar.gz | tar -zxC /data_models/ +RUN curl -SL https://github.com/LibrePhotos/librephotos-docker/releases/download/0.1/im2txt.tar.gz | tar -zxC /data_models/ +RUN curl -SL https://github.com/LibrePhotos/librephotos-docker/releases/download/0.1/clip-embeddings.tar.gz | tar -zxC /data_models/ +RUN curl -SL https://download.pytorch.org/models/resnet152-b121ed2d.pth -o /root/.cache/torch/hub/checkpoints/resnet152-b121ed2d.pth + RUN pip install torch==1.8.0+cpu torchvision==0.9.0+cpu -f https://download.pytorch.org/whl/torch_stable.html RUN pip3 install pyvips diff --git a/backend/entrypoint.sh b/backend/entrypoint.sh index 2efa2115f6542367ab33908074c941f8d8f3a176..12216004dea1ab6ba3255469a8691a4365f685c4 100755 --- a/backend/entrypoint.sh +++ b/backend/entrypoint.sh @@ -17,8 +17,8 @@ python manage.py rqworker default 2>&1 | tee /logs/rqworker.log & if [ "$DEBUG" = 1 ] then echo "development backend starting" - gunicorn --worker-class=gevent --timeout 36000 --reload --bind backend:8001 --log-level=info ownphotos.wsgi 2>&1 | tee /logs/gunicorn_django.log + gunicorn --worker-class=gevent --timeout 36000 --reload --bind 0.0.0.0:8001 --log-level=info ownphotos.wsgi 2>&1 | tee /logs/gunicorn_django.log else echo "production backend starting" - gunicorn --worker-class=gevent --timeout 3600 --bind backend:8001 --log-level=info ownphotos.wsgi 2>&1 | tee /logs/gunicorn_django.log + gunicorn --worker-class=gevent --timeout 3600 --bind 0.0.0.0:8001 --log-level=info ownphotos.wsgi 2>&1 | tee /logs/gunicorn_django.log fi diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 7c2be6dc405f4e38242929dec6bf50e50af88d33..ac9217706f58d1a9249b41b97684abfed28739cc 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:13 +FROM node:13-slim RUN apt-get update && apt-get install -y curl git xsel