Skip to content

Commit

Permalink
Merge pull request #526 from wake0up0ne0/master
Browse files Browse the repository at this point in the history
fix typo in dockerfile name
  • Loading branch information
ashwin31 authored May 15, 2024
2 parents 757cdd6 + 7e26d1f commit 11184ce
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pip install -r requirements.txt
### Docker / docker-compose
in order to use docker, please run the next commands after cloning repo:
```
docker build -t djcrm:1 -f docker/Dockerfile .
docker build -t djcrm:1 -f docker/dockerfile .
docker-compose -f docker/docker-compose.yml up
```

Expand Down
10 changes: 8 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ services:
- DBPASSWORD=crm
- DBHOST=crm-db
- DBPORT=5432

- ENV_TYPE=development
- [email protected]
- [email protected]
- CELERY_BROKER_URL="celery.url"
- CELERY_RESULT_BACKEND="celery.backend.url"
- DOMAIN_NAME="DOMAIN.NAME"
- SWAGGER_ROOT_URL="SWAGGER.ROOT.URL"
depends_on:
- crm-db
ports:
Expand All @@ -18,7 +24,7 @@ services:
- nw

crm-db:
image: postgres:latest
image: postgres:12-bookworm
container_name: crm-db
environment:
- POSTGRES_DB=crm
Expand Down
6 changes: 6 additions & 0 deletions docker/dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ RUN apt install -y python3-pip
RUN python3 -m pip install --no-cache-dir -r requirements.txt
RUN python3 -m pip install --no-cache-dir redis

RUN python3 -c 'from django.core.management.utils import get_random_secret_key; print(get_random_secret_key())' > /app/secret_key.txt
ENV SECRET_KEY \
$(cat /app/secret_key.txt)
RUN rm /app/secret_key.txt


COPY . /app
COPY docker/entrypoint.sh /app
COPY docker/wait-for-postgres.sh /app
Expand Down

0 comments on commit 11184ce

Please sign in to comment.