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