Merge branch '0.5.0--docker' into development

This commit is contained in:
th3r00t
2020-05-12 16:14:25 -04:00
committed by GitHub
7 changed files with 42 additions and 3 deletions

1
.gitignore vendored
View File

@@ -125,7 +125,6 @@ dmypy.json
# End of https://www.gitignore.io/api/python
0
config.backup.json
create_db.sql
uwsgi.ini
installer.log
pyshelf_nginx.conf

20
Dockerfile vendored Normal file
View File

@@ -0,0 +1,20 @@
FROM archlinux:latest
RUN pacman -Syy
RUN pacman -Syu --noconfirm
RUN pacman -S --noconfirm python python-pip git postgresql sudo gcc
RUN sudo -u postgres initdb --locale=en_US.UTF-8 -E UTF8 -D /var/lib/postgres/data
RUN useradd pyshelf && chpasswd pyshelf:pyshelf
#RUN mkdir -p /srv/Books && mkdir -p /srv/http && mkdir -p /srv/logs/ && mkdir -p /run/postgresql && \
# touch /srv/logs/pgsql.log && chown postgres.postgres /run/postgresql && \
# chown http.pyshelf /srv/Books && chown http.pyshelf /srv/http && chown postgres.postgres /srv/logs/pgsql.log
VOLUME /srv/Books ./Books
VOLUME /srv/http .
VOLUME /srv/logs ./logs
VOLUME /var/lib/postgres/data ./pgdata
RUN sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start
RUN sudo -u postgres psql -f create_db.sql
ENV PYTHONUNBUFFERED=1
WORKDIR /srv/http
RUN pip install -r requirements.txt
EXPOSE 80 8000
CMD ["sh", "-c","/srv/http/entry.sh"]

2
config.json vendored
View File

@@ -1 +1 @@
{"TITLE": "pyShelf E-Book Server", "VERSION": "0.5.0", "BOOKPATH": "", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"}
{"TITLE": "pyShelf E-Book Server", "VERSION": "0.5.0", "BOOKPATH": "/srv/Books", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"}

3
create_db.sql vendored Executable file
View File

@@ -0,0 +1,3 @@
CREATE USER pyshelf WITH PASSWORD 'pyshelf';
CREATE DATABASE pyshelf;
GRANT ALL PRIVILEGES ON DATABASE pyshelf TO pyshelf;

13
database.sh vendored Executable file
View File

@@ -0,0 +1,13 @@
#!/bin/bash
sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start &&
sudo -u postgres psql -f create_db.sql &&
rm /srv/http/database.sh &&
echo "sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/lgsql.log start" > /srv/http/database.sh &&
chmod +x /srv/http/database.sh &&
cd src && \
python manage.py makemigrations && \
python manage.py makemigrations interface && \
python manage.py migrate && \
python manage.py migrate interface && \
cd ..
echo "pyShelf Env Started"

4
entry.sh vendored Executable file
View File

@@ -0,0 +1,4 @@
#!/bin/bash
#sh /srv/http/database.sh
sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start &&
#gunicorn pyShelf.wsgi 8000:8000

2
requirements.txt vendored
View File

@@ -16,4 +16,4 @@ django-debug-toolbar
psycopg2-binary
prompt_toolkit
psutil
pyfiglet
pyfiglet