diff --git a/.dockerignore b/.dockerignore index 282ad58..c262680 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,7 +4,7 @@ downloads app/migrations README.md docker-compose.yml -.env +app/.env *.log *.pyc __pychache__ diff --git a/.gitignore b/.gitignore index eba21b7..3d9494c 100644 --- a/.gitignore +++ b/.gitignore @@ -120,7 +120,7 @@ celerybeat.pid *.sage.py # Environments -.env +app/.env .venv env/ venv/ diff --git a/app/docs/commands/docker.md b/app/docs/commands/docker.md index ab6151b..4ab882d 100644 --- a/app/docs/commands/docker.md +++ b/app/docs/commands/docker.md @@ -1,6 +1,6 @@ # Docker Commands -Download the image from [dockehub](https://hub.docker.com/r/jiisanda/docflow). +Download the image from [DockerHub](https://hub.docker.com/r/jiisanda/docflow). OR diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 518d812..4218a98 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -8,4 +8,4 @@ services: ports: - "80:80" volumes: - - ./nginx:/etc/nginx/conf.dAnd \ No newline at end of file + - ./nginx:/etc/nginx/conf.d \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 14966d8..ea3ddff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,13 +5,10 @@ services: - postgres ports: - "8000:8000" - env_file: ./.env + env_file: app/.env postgres: image: postgres - env_file: ./.env - environment: - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - - POSTGRES_DB=${POSTGRES_DB} + env_file: app/.env volumes: - postgres-db:/var/lib/postgresql/data