Added cron to the Dockerfile as temporary fix until we have periodic file scanning in the backend

This commit is contained in:
MartenBE
2020-08-09 15:51:24 +02:00
parent ffb649747c
commit 7bbe8c900d
6 changed files with 35 additions and 14 deletions

28
docker/Dockerfile vendored
View File

@@ -1,3 +1,14 @@
# This file is used to build the Dockerhub image. To host pyShelf yourself for
# production, please use the official pyShelf image on
# https://hub.docker.com/r/pyshelf/pyshelf
# Use the following commands to build and push the docker image to Dockerhub:
#
# docker build -t pyshelf/pyshelf -f .\docker\Dockerfile .
# docker login
# docker push pyshelf/pyshelf
FROM ubuntu
EXPOSE 8000
@@ -5,22 +16,27 @@ EXPOSE 8000
RUN apt-get update -y
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential python3 python3-dev python3-pip python3-venv nginx-full
COPY . /pyshelf
WORKDIR /pyshelf/
RUN python3 -m pip install -r requirements.txt
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cron
RUN echo "* * * * * cd /pyshelf/ && python3 importBooks >> /var/log/cron.log 2>&1" > import_books_scheduler.cron && crontab import_books_scheduler.cron
COPY ./docker/pyshelf_nginx.conf /etc/nginx/sites-available/pyshelf_nginx.conf
RUN ln -s /etc/nginx/sites-available/pyshelf_nginx.conf /etc/nginx/sites-enabled/
COPY . /pyshelf
COPY ./docker/config.json /pyshelf/config.json
WORKDIR /pyshelf/
ENTRYPOINT cd src/ \
RUN python3 -m pip install -r requirements.txt
WORKDIR /pyshelf/
ENTRYPOINT cron start \
&& python3 configure \
&& cd src/ \
&& python3 manage.py makemigrations \
&& python3 manage.py makemigrations interface \
&& python3 manage.py migrate \
&& python3 manage.py migrate interface \
&& cd .. \
&& python3 configure \
&& python3 importBooks \
&& nginx -g "daemon on;" \
&& uwsgi --ini uwsgi.ini

1
docker/config.json vendored Normal file
View File

@@ -0,0 +1 @@
{"TITLE": "pyShelf E-Book Server", "VERSION": "Docker", "BOOKPATH": "/books", "DB_HOST": "db", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "SECRET": ""}

View File

@@ -1,11 +1,12 @@
version: "3.7"
# This file is used to test the docker image. To host pyShelf yourself for
# This file is used to test the Dockerhub image. To host pyShelf yourself for
# production, please use the official pyShelf image on
# https://hub.docker.com/r/pyshelf/pyshelf
# For development, use the following command in the root folder:
# `docker-compose -f .\docker\development.docker-compose.yml up --build`
#
# docker-compose -f .\docker\development.docker-compose.yml up --build
services:
db: