From a17770b8240abcb5b828a392767482190b7b8656 Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Tue, 14 Jul 2020 13:27:08 -0700 Subject: [PATCH 1/2] Add network to docker-compose for compatability --- docker/Dockerfile | 2 +- docker/docker-compose.yml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 32f85bc..ebc5e95 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,6 +15,6 @@ 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 #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 399262f..4940c92 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -21,3 +21,10 @@ services: - "${PORT}:8000" depends_on: - db + +networks: + default: + driver: bridge + ipam: + config: + - subnet: 10.20.20.0/24 From b0774d6fc18b30349964fbede804b065d9f1d36c Mon Sep 17 00:00:00 2001 From: Tony Hendrick Date: Tue, 14 Jul 2020 13:31:23 -0700 Subject: [PATCH 2/2] Update README to include docker run commands --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f7dc63a..9dd3b34 100755 --- a/README.md +++ b/README.md @@ -90,6 +90,8 @@ Edit [docker/.env](docker/.env) `docker exec -it -d docker_pyshelf_1 python3 manage.py migrate` +`docker exec -it -d docker_pyshelf_1 python3 manage.py runserver 0.0.0.0:8000` + IMPORT BOOKS Once the .epub files are in the directory specified in [docker/.env](docker/.env)