Skip to content

Commit b18803c

Browse files
authored
Bump django and add depends_on (#15)
* bumping django version * adding depends_on so database is started before uwsgi, and bumping django Signed-off-by: vsoch <vsoch@users.noreply.github.com> Co-authored-by: vsoch <vsoch@users.noreply.github.com>
1 parent 78e35bb commit b18803c

File tree

2 files changed

+31
-27
lines changed

2 files changed

+31
-27
lines changed

docker-compose.yml

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
1-
db:
2-
image: postgres
3-
environment:
4-
- POSTGRES_HOST_AUTH_METHOD=trust
1+
version: "2"
2+
services:
3+
db:
4+
image: postgres
5+
environment:
6+
- POSTGRES_HOST_AUTH_METHOD=trust
57

6-
uwsgi:
7-
restart: always
8-
build: .
9-
volumes:
10-
- .:/code
11-
- ./static:/var/www/static
12-
- ./images:/var/www/images
13-
links:
14-
- db
8+
uwsgi:
9+
restart: always
10+
build: .
11+
depends_on:
12+
- db
13+
volumes:
14+
- .:/code
15+
- ./static:/var/www/static
16+
- ./images:/var/www/images
17+
links:
18+
- db
1519

16-
nginx:
17-
restart: always
18-
build: nginx
19-
ports:
20-
- "80:80"
21-
volumes:
22-
- ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
23-
- ./uwsgi_params.par:/etc/nginx/uwsgi_params.par:ro
24-
volumes_from:
25-
- uwsgi
26-
links:
27-
- uwsgi
28-
- db
20+
nginx:
21+
restart: always
22+
build: nginx
23+
ports:
24+
- "80:80"
25+
volumes:
26+
- ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
27+
- ./uwsgi_params.par:/etc/nginx/uwsgi_params.par:ro
28+
volumes_from:
29+
- uwsgi
30+
links:
31+
- uwsgi
32+
- db

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
uwsgi
2-
Django==2.0.8
2+
Django==2.2.13
33
psycopg2-binary

0 commit comments

Comments
 (0)