Merge pull request #44 from hat/master

Updating Docker branch

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)

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"]

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