From 545740659c85bbda5dc6f2483d5f7ea8a8f20969 Mon Sep 17 00:00:00 2001 From: th3r00t Date: Mon, 11 May 2020 22:57:04 -0400 Subject: [PATCH 01/18] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 00cd8f1..f822b92 100755 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@

Having used Calibre for hosting my eBook collection in the past, I found myself frustrated having to install X on my server, or manage my library externally, Thus I have decided to spin up my own.

https://pyshelf.com

-![pyShelf 0.5.0 Collection 1](https://github.com/th3r00t/pyShelf/raw/development/preview_050.png) -![pyShelf 0.5.0 Collection 2](https://github.com/th3r00t/pyShelf/raw/development/preview_1_050.png) +![pyShelf 0.5.0 Collection 1](https://github.com/th3r00t/pyShelf/raw/master/preview_050.png) +![pyShelf 0.5.0 Collection 2](https://github.com/th3r00t/pyShelf/raw/master/preview_1_050.png)

Discord [https://discord.gg/H9TbNJS](https://discord.gg/H9TbNJS) | IRC freenode.net @ #pyshelf

From 245f3d09a8d97ea30bba5cf8f4af4c9546f351e2 Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Tue, 12 May 2020 15:08:01 -0700 Subject: [PATCH 02/18] Change settings.py and config.json to use an external PostgresDB --- config.json | 2 +- src/frontend/settings.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config.json b/config.json index 71951be..be6ecb6 100755 --- a/config.json +++ b/config.json @@ -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": "", "DB_HOST": "db", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "mysecretpassword", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"} diff --git a/src/frontend/settings.py b/src/frontend/settings.py index 6fe29bb..470ce96 100755 --- a/src/frontend/settings.py +++ b/src/frontend/settings.py @@ -99,6 +99,8 @@ DATABASES = { "NAME": CONFIG.catalogue_db, "USER": "pyshelf", "PASSWORD": CONFIG.password, + "HOST": CONFIG.db_host, + "PORT": CONFIG.db_port, } } From 9014081bff375f4a2432be676b1b18dce514d3ee Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Tue, 12 May 2020 21:38:25 -0700 Subject: [PATCH 03/18] Adding docker directory with docker support --- config.json | 2 +- docker/.env | 6 ++++++ docker/Dockerfile | 18 ++++++++++++++++++ docker/docker-compose.yml | 21 +++++++++++++++++++++ requirements.txt | 1 + 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 docker/.env create mode 100644 docker/Dockerfile create mode 100644 docker/docker-compose.yml diff --git a/config.json b/config.json index be6ecb6..5053faa 100755 --- a/config.json +++ b/config.json @@ -1 +1 @@ -{"TITLE": "pyShelf E-Book Server", "VERSION": "0.5.0", "BOOKPATH": "", "DB_HOST": "db", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "mysecretpassword", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"} +{"TITLE": "pyShelf E-Book Server", "VERSION": "0.5.0", "BOOKPATH": "", "DB_HOST": "db", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"} diff --git a/docker/.env b/docker/.env new file mode 100644 index 0000000..c86c711 --- /dev/null +++ b/docker/.env @@ -0,0 +1,6 @@ +LOCAL_BOOK_DIR=/home/marvin/git/hatpyShelf/docker/Books/ +PORT=8088 +POSTGRES_VER=12.2 +POSTGRES_USER=pyshelf +POSTGRES_PASSWORD=pyshelf +POSTGRES_DB=pyshelf diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..8ea134c --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,18 @@ +# docker build -t ubuntu1604py36 +FROM ubuntu:18.04 + +RUN apt-get update && apt-get install -y software-properties-common +RUN add-apt-repository ppa:deadsnakes/ppa +RUN apt-get update -y + +RUN apt-get install -y build-essential python3.8 python3.8-dev python3-pip python3.8-venv && apt-get install -y git + +# update pip +RUN python3 -m pip install wheel +RUN git clone https://github.com/hat/pyShelf.git /usr/src/app/ +RUN python3 -m pip install -r /usr/src/app/requirements.txt +#CMD [""] +#RUN python3 manage.py migrate +#RUN python3 manage.py migrate interface +WORKDIR /usr/src/app/src/ +CMD ["python3", "manage.py", "runserver"] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..3d29bc2 --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,21 @@ +version: "3.3" +services: + db: + image: "postgres:${POSTGRES_VER}" + environment: + - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD}" + - "POSTGRES_USER=${POSTGRES_USER}" + - "POSTGRES_DB=${POSTGRES_DB}" + + pyshelf: + build: + context: ./ + dockerfile: Dockerfile + volumes: + - "${LOCAL_BOOK_DIR}:/Books" + ports: + - "8088:8000" + links: + - "db:db" + depends_on: + - db diff --git a/requirements.txt b/requirements.txt index 749a3dd..5557e73 100755 --- a/requirements.txt +++ b/requirements.txt @@ -17,3 +17,4 @@ psycopg2-binary prompt_toolkit psutil pyfiglet +pudb From 3a19041324e1d73bc7a0aa3c00939b771782f661 Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Tue, 12 May 2020 22:28:27 -0700 Subject: [PATCH 04/18] Dockerfile loading homepage, books not showing when in correct folder --- docker/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8ea134c..4f11133 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,8 +11,10 @@ RUN apt-get install -y build-essential python3.8 python3.8-dev python3-pip pytho RUN python3 -m pip install wheel RUN git clone https://github.com/hat/pyShelf.git /usr/src/app/ RUN python3 -m pip install -r /usr/src/app/requirements.txt -#CMD [""] +EXPOSE 8000 +#CMD ["bin/bash"] + +WORKDIR /usr/src/app/src/ #RUN python3 manage.py migrate #RUN python3 manage.py migrate interface -WORKDIR /usr/src/app/src/ -CMD ["python3", "manage.py", "runserver"] +CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] From 9e66fbed26c70ca9cb79f4d758c0fb3a97831c7b Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Wed, 13 May 2020 10:54:51 -0700 Subject: [PATCH 05/18] Adding defaults to config.json --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 5053faa..8ccb020 100755 --- a/config.json +++ b/config.json @@ -1 +1 @@ -{"TITLE": "pyShelf E-Book Server", "VERSION": "0.5.0", "BOOKPATH": "", "DB_HOST": "db", "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": "/Books", "DB_HOST": "db", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"} From febacd73bb95f1893136fdd17d4aaded3add9f60 Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Thu, 14 May 2020 10:41:35 -0700 Subject: [PATCH 06/18] Changing config and location of books directory --- config.json | 2 +- docker/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 8ccb020..dba7083 100755 --- a/config.json +++ b/config.json @@ -1 +1 @@ -{"TITLE": "pyShelf E-Book Server", "VERSION": "0.5.0", "BOOKPATH": "/Books", "DB_HOST": "db", "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": "Books", "DB_HOST": "db", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"} diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 3d29bc2..5996c88 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -12,7 +12,7 @@ services: context: ./ dockerfile: Dockerfile volumes: - - "${LOCAL_BOOK_DIR}:/Books" + - "${LOCAL_BOOK_DIR}:/usr/src/app/Books" ports: - "8088:8000" links: From 0876b3953befd4e5e71aa33c04edb91dc2edd4ba Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Thu, 14 May 2020 11:29:50 -0700 Subject: [PATCH 07/18] docker-compose is now functional added a cronjob in the pyShelf container to update the Books directory every 5 minutes went back to using a variable for the exposed port --- README.md | 10 ++++++++++ docker/.env | 2 +- docker/docker-compose.yml | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f822b92..6ddd054 100755 --- a/README.md +++ b/README.md @@ -78,6 +78,16 @@ All configuration is now handled by the installer. Running via the Django test server might be possible, albeit not recomended. +## Docker + +Installation for Docker is handled by docker-compose + +It will spin up two containers: one postgres, one for the Django application + +Edit [docker/.env](docker.env) +`sudo docker-compose -f docker/docker-compose.yml --env-file docker/.env build` +`sudo docker-compose -f docker/docker-compose.yml --env-file=docker/.env up -d` + ### In Progress #### Organizational tools. diff --git a/docker/.env b/docker/.env index c86c711..75596a2 100644 --- a/docker/.env +++ b/docker/.env @@ -1,4 +1,4 @@ -LOCAL_BOOK_DIR=/home/marvin/git/hatpyShelf/docker/Books/ +LOCAL_BOOK_DIR=~/Books #This directory will be craeted otherwise link to the directory containing your .epub files PORT=8088 POSTGRES_VER=12.2 POSTGRES_USER=pyshelf diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 5996c88..4b87e6e 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,8 +13,9 @@ services: dockerfile: Dockerfile volumes: - "${LOCAL_BOOK_DIR}:/usr/src/app/Books" + - "./cron/root:/etc/crontabs/root" ports: - - "8088:8000" + - "${PORT}:8000" links: - "db:db" depends_on: From 892765189f2150b13755aea0777e29f8960a65f0 Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 14 May 2020 11:31:30 -0700 Subject: [PATCH 08/18] Update README.md Clean up the Docker section --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ddd054..98555ec 100755 --- a/README.md +++ b/README.md @@ -84,7 +84,8 @@ Installation for Docker is handled by docker-compose It will spin up two containers: one postgres, one for the Django application -Edit [docker/.env](docker.env) +Edit [docker/.env](docker/docker.env) + `sudo docker-compose -f docker/docker-compose.yml --env-file docker/.env build` `sudo docker-compose -f docker/docker-compose.yml --env-file=docker/.env up -d` From f17ecd6e21b89917fdd96f4ebe015bbe84f22b5e Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 14 May 2020 11:32:46 -0700 Subject: [PATCH 09/18] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98555ec..0b0e637 100755 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ Installation for Docker is handled by docker-compose It will spin up two containers: one postgres, one for the Django application -Edit [docker/.env](docker/docker.env) +Edit [docker/.env](docker/.env) `sudo docker-compose -f docker/docker-compose.yml --env-file docker/.env build` `sudo docker-compose -f docker/docker-compose.yml --env-file=docker/.env up -d` From 1e72276a6b3d7c8905c7dea32ee4d9ec2777d54c Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 14 May 2020 11:38:41 -0700 Subject: [PATCH 10/18] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0b0e637..4afe8ed 100755 --- a/README.md +++ b/README.md @@ -87,6 +87,7 @@ It will spin up two containers: one postgres, one for the Django application Edit [docker/.env](docker/.env) `sudo docker-compose -f docker/docker-compose.yml --env-file docker/.env build` + `sudo docker-compose -f docker/docker-compose.yml --env-file=docker/.env up -d` ### In Progress From bd60b7a60b9a2ad7e82c1c0d87c847d61e42f6b7 Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Thu, 14 May 2020 11:49:39 -0700 Subject: [PATCH 11/18] Dockerfile was missing migrations --- docker/.env | 2 +- docker/Dockerfile | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docker/.env b/docker/.env index 75596a2..b60e7da 100644 --- a/docker/.env +++ b/docker/.env @@ -1,4 +1,4 @@ -LOCAL_BOOK_DIR=~/Books #This directory will be craeted otherwise link to the directory containing your .epub files +LOCAL_BOOK_DIR=/home/marvin/git/pyShelf/Books PORT=8088 POSTGRES_VER=12.2 POSTGRES_USER=pyshelf diff --git a/docker/Dockerfile b/docker/Dockerfile index 4f11133..81b374b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,9 +12,8 @@ RUN python3 -m pip install wheel RUN git clone https://github.com/hat/pyShelf.git /usr/src/app/ RUN python3 -m pip install -r /usr/src/app/requirements.txt EXPOSE 8000 -#CMD ["bin/bash"] WORKDIR /usr/src/app/src/ -#RUN python3 manage.py migrate -#RUN python3 manage.py migrate interface +RUN python3 manage.py migrate +RUN python3 manage.py migrate interface CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] From 2ae26b0e7ba93e2469d7fcdacc8e56022be9ce3e Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Thu, 14 May 2020 12:00:53 -0700 Subject: [PATCH 12/18] Need to depend_on wand wait for Postgres container --- docker/Dockerfile | 1 + docker/docker-compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 81b374b..267923c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,6 +14,7 @@ RUN python3 -m pip install -r /usr/src/app/requirements.txt EXPOSE 8000 WORKDIR /usr/src/app/src/ +RUN ../docker/scripts/wait-for-it.sh db:5432 RUN python3 manage.py migrate RUN python3 manage.py migrate interface CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 4b87e6e..81785ac 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -14,6 +14,7 @@ services: volumes: - "${LOCAL_BOOK_DIR}:/usr/src/app/Books" - "./cron/root:/etc/crontabs/root" + - "./scripts/wait-for-it.sh:/usr/src/app/src/" ports: - "${PORT}:8000" links: From d649761e4ea73058338c3996b12241131a03f223 Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Thu, 14 May 2020 15:20:41 -0700 Subject: [PATCH 13/18] Removing migrate from Dockerfile --- README.md | 2 ++ docker/Dockerfile | 6 +++--- docker/docker-compose.yml | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4afe8ed..9b91ffd 100755 --- a/README.md +++ b/README.md @@ -90,6 +90,8 @@ Edit [docker/.env](docker/.env) `sudo docker-compose -f docker/docker-compose.yml --env-file=docker/.env up -d` +`sudo docker exec -it docker_pyshelf_1 python3 manage.py migrate` + ### In Progress #### Organizational tools. diff --git a/docker/Dockerfile b/docker/Dockerfile index 267923c..32f85bc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ RUN python3 -m pip install -r /usr/src/app/requirements.txt EXPOSE 8000 WORKDIR /usr/src/app/src/ -RUN ../docker/scripts/wait-for-it.sh db:5432 -RUN python3 manage.py migrate -RUN python3 manage.py migrate interface +#RUN ../docker/scripts/wait-for-it.sh db:5432 +#RUN python3 manage.py migrate +#RUN python3 manage.py migrate interface CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 81785ac..399262f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3.7" services: db: image: "postgres:${POSTGRES_VER}" @@ -6,6 +6,8 @@ services: - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD}" - "POSTGRES_USER=${POSTGRES_USER}" - "POSTGRES_DB=${POSTGRES_DB}" + volumes: + - ./postgres_data/:/var/lib/postgresql/data/ pyshelf: build: @@ -13,11 +15,9 @@ services: dockerfile: Dockerfile volumes: - "${LOCAL_BOOK_DIR}:/usr/src/app/Books" - - "./cron/root:/etc/crontabs/root" - - "./scripts/wait-for-it.sh:/usr/src/app/src/" + # - "./cron/root:/etc/crontabs/root" + # - "./scripts/wait-for-it.sh:/usr/src/app/src/" ports: - "${PORT}:8000" - links: - - "db:db" depends_on: - db From 4e767bf0d47f619f3f9a78caf838684c38bf2e8b Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Thu, 14 May 2020 15:38:26 -0700 Subject: [PATCH 14/18] update README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b91ffd..f4902c1 100755 --- a/README.md +++ b/README.md @@ -86,12 +86,13 @@ It will spin up two containers: one postgres, one for the Django application Edit [docker/.env](docker/.env) -`sudo docker-compose -f docker/docker-compose.yml --env-file docker/.env build` `sudo docker-compose -f docker/docker-compose.yml --env-file=docker/.env up -d` `sudo docker exec -it docker_pyshelf_1 python3 manage.py migrate` +'sudo docker exec -it docker_pyshelf_1 python3 manage.py runserver 0.0.0.0:8000' + ### In Progress #### Organizational tools. From 4b5ffaaabfbab33c1cf98488be2bd2467b618493 Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 14 May 2020 17:19:11 -0700 Subject: [PATCH 15/18] Update README.md all steps not correct for Docker to run --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f4902c1..bd72308 100755 --- a/README.md +++ b/README.md @@ -86,12 +86,9 @@ It will spin up two containers: one postgres, one for the Django application Edit [docker/.env](docker/.env) +`docker-compose -f docker/docker-compose.yml --env-file=docker/.env up -d` -`sudo docker-compose -f docker/docker-compose.yml --env-file=docker/.env up -d` - -`sudo docker exec -it docker_pyshelf_1 python3 manage.py migrate` - -'sudo docker exec -it docker_pyshelf_1 python3 manage.py runserver 0.0.0.0:8000' +`docker exec -it -d docker_pyshelf_1 python3 manage.py migrate` ### In Progress From cf73cb0d711edaf1f3c08dea5c9f83a937026959 Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 14 May 2020 18:04:14 -0700 Subject: [PATCH 16/18] Upadte README.md Add how to import books from the docker container --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index bd72308..a71cf14 100755 --- a/README.md +++ b/README.md @@ -90,6 +90,14 @@ Edit [docker/.env](docker/.env) `docker exec -it -d docker_pyshelf_1 python3 manage.py migrate` +IMPORT BOOKS + +Once the .epub files are in the directory specified in [docker/.env](docker/.env) + +`docker exec -it docker_pyshelf_1 /bin/bash` + +`cd /usr/src/app/ && python3 importBooks` + ### In Progress #### Organizational tools. From 61236a19a786f4d3891d840e950ead5762a99414 Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 14 May 2020 18:05:37 -0700 Subject: [PATCH 17/18] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index a71cf14..f7dc63a 100755 --- a/README.md +++ b/README.md @@ -98,6 +98,12 @@ Once the .epub files are in the directory specified in [docker/.env](docker/.env `cd /usr/src/app/ && python3 importBooks` +### Docker Future Enhancements + +- [ ] Change method of importing books ssibly cron or using the Django code +- [ ] Look into having the migration work without having to manually execute + + ### In Progress #### Organizational tools. From 1cc17aac4909b96d6b3979ea5efb8a29094ec4ac Mon Sep 17 00:00:00 2001 From: Tony Date: Thu, 14 May 2020 18:06:12 -0700 Subject: [PATCH 18/18] Update .env --- docker/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/.env b/docker/.env index b60e7da..8c02342 100644 --- a/docker/.env +++ b/docker/.env @@ -1,4 +1,4 @@ -LOCAL_BOOK_DIR=/home/marvin/git/pyShelf/Books +LOCAL_BOOK_DIR=/home/user/pyShelf/Books PORT=8088 POSTGRES_VER=12.2 POSTGRES_USER=pyshelf