Skip to content

Commit b346e1c

Browse files
feat(docker-compose): update docker-compose.yml to version 3
1 parent cd78ebe commit b346e1c

File tree

2 files changed

+90
-77
lines changed

2 files changed

+90
-77
lines changed

docker-compose.yml

+47-40
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
1-
web:
2-
restart: always
3-
build: ./web
4-
expose:
5-
- "8000"
6-
links:
7-
- postgres:postgres
8-
- redis:redis
9-
volumes:
10-
- /usr/src/app
11-
- /usr/src/app/static
12-
env_file: .env
13-
environment:
14-
DEBUG: 'true'
15-
command: /usr/local/bin/gunicorn docker_django.wsgi:application -w 2 -b :8000
1+
version: '3'
162

17-
nginx:
18-
restart: always
19-
build: ./nginx/
20-
ports:
21-
- "80:80"
22-
volumes:
23-
- /www/static
24-
volumes_from:
25-
- web
26-
links:
27-
- web:web
3+
services:
4+
web:
5+
restart: always
6+
build: ./web
7+
expose:
8+
- "8000"
9+
links:
10+
- postgres:postgres
11+
- redis:redis
12+
volumes:
13+
- web-django:/usr/src/app
14+
- web-static:/usr/src/app/static
15+
env_file: .env
16+
environment:
17+
DEBUG: 'true'
18+
command: /usr/local/bin/gunicorn docker_django.wsgi:application -w 2 -b :8000
2819

29-
postgres:
30-
restart: always
31-
image: postgres:latest
32-
ports:
33-
- "5432:5432"
34-
volumes:
35-
- pgdata:/var/lib/postgresql/data/
20+
nginx:
21+
restart: always
22+
build: ./nginx/
23+
ports:
24+
- "80:80"
25+
volumes:
26+
- web-static:/www/static
27+
links:
28+
- web:web
3629

37-
redis:
38-
restart: always
39-
image: redis:latest
40-
ports:
41-
- "6379:6379"
42-
volumes:
43-
- redisdata:/data
30+
postgres:
31+
restart: always
32+
image: postgres:latest
33+
ports:
34+
- "5432:5432"
35+
volumes:
36+
- pgdata:/var/lib/postgresql/data/
37+
38+
redis:
39+
restart: always
40+
image: redis:latest
41+
ports:
42+
- "6379:6379"
43+
volumes:
44+
- redisdata:/data
45+
46+
volumes:
47+
web-django:
48+
web-static:
49+
pgdata:
50+
redisdata:

production.yml

+43-37
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,46 @@
1-
web:
2-
restart: always
3-
build: ./web
4-
expose:
5-
- "8000"
6-
links:
7-
- postgres:postgres
8-
- redis:redis
9-
volumes:
10-
- /usr/src/app/static
11-
env_file: .env
12-
command: /usr/local/bin/gunicorn docker_django.wsgi:application -w 2 -b :8000
1+
version: '3'
132

14-
nginx:
15-
restart: always
16-
build: ./nginx/
17-
ports:
18-
- "80:80"
19-
volumes:
20-
- /www/static
21-
volumes_from:
22-
- web
23-
links:
24-
- web:web
3+
services:
4+
web:
5+
restart: always
6+
build: ./web
7+
expose:
8+
- "8000"
9+
links:
10+
- postgres:postgres
11+
- redis:redis
12+
volumes:
13+
- web-static:/usr/src/app/static
14+
env_file: .env
15+
command: /usr/local/bin/gunicorn docker_django.wsgi:application -w 2 -b :8000
2516

26-
postgres:
27-
restart: always
28-
image: postgres:latest
29-
ports:
30-
- "5432"
31-
volumes:
32-
- pgdata:/var/lib/postgresql/data/
17+
nginx:
18+
restart: always
19+
build: ./nginx/
20+
ports:
21+
- "80:80"
22+
volumes:
23+
- web-static:/www/static
24+
links:
25+
- web:web
3326

34-
redis:
35-
restart: always
36-
image: redis:latest
37-
ports:
38-
- "6379"
39-
volumes:
40-
- redisdata:/data
27+
postgres:
28+
restart: always
29+
image: postgres:latest
30+
ports:
31+
- "5432"
32+
volumes:
33+
- pgdata:/var/lib/postgresql/data/
34+
35+
redis:
36+
restart: always
37+
image: redis:latest
38+
ports:
39+
- "6379"
40+
volumes:
41+
- redisdata:/data
42+
43+
volumes:
44+
web-static:
45+
pgdata:
46+
redisdata:

0 commit comments

Comments
 (0)