th3r00t/pyShelf
1
0
Fork 0
mirror of https://github.com/th3r00t/pyShelf.git synced 2026-04-28 01:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Phased out nginx in favor of running django under daphne with asgi.

Browse Source 
Adjusted the docker image in favor of this, & fixed urls.py which was
missing the static request responder.
This commit is contained in:
th3r00t
2020-09-11 16:50:17 -04:00
parent 0391bb94a4
commit 68d453edc8
10 changed files with 80 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
docker/Dockerfile vendored
View File

@@ -12,25 +12,16 @@
FROM ubuntu
EXPOSE 8000
EXPOSE 1337
RUN apt-get update -y
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential python3 python3-dev python3-pip python3-venv nginx-full
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/
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential python3 python3-dev python3-pip python3-venv
COPY . /pyshelf
COPY ./docker/config.json /pyshelf/config.json
WORKDIR /pyshelf/
RUN python3 -m pip install -r requirements.txt
RUN python3 configure
WORKDIR /pyshelf/
ENTRYPOINT cron start \
&& python3 configure \
# && python3 importBooks \
&& nginx -g "daemon on;" \
&& uwsgi --ini uwsgi.ini
ENTRYPOINT daphne --root-path=/pyshelf/src/interface frontend.asgi:application

15
docker/config.json vendored
View File

@@ -1 +1,14 @@
{"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": ""}
{
"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": "",
"BUILD_MODE": "production"
}