Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit 2de179f

Browse files
committedSep 30, 2018
Solve container names by hostname with dns proxy
1 parent 9ab1228 commit 2de179f

5 files changed

+31
-16
lines changed
 

‎config/default-docker.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"baseURL": "http://api:3030",
23
"mongodb": "mongodb://mongo:27017/hc_api",
34
"host": "0.0.0.0"
45
}

‎config/local-staging-docker.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
{
2-
"baseURL": "http://172.25.0.11:3030",
32
"seeder": {
43
"runOnInit": true,
5-
"dropDatabase": true
4+
"dropDatabase": false
65
},
76
"smtpConfig": {
87
"host": "maildev",
98
"port": 25,
109
"ignoreTLS": true
1110
},
1211
"thumbor": {
13-
"url": "http://localhost:8000",
12+
"url": "http://thumbor:8000",
1413
"key": ""
1514
}
1615
}

‎docker-compose.override.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3'
1+
version: '3.5'
22

33
services:
44
api:

‎docker-compose.staging.yml

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
version: '3'
1+
version: '3.5'
22

33
services:
44
api:
5-
image: humanconnection/api-feathers
5+
image: humanconnection/api-feathers:edge
66
build:
77
context: .
88
environment:
@@ -13,20 +13,19 @@ services:
1313
ports:
1414
- "3030:3030"
1515
networks:
16-
hc-network:
17-
ipv4_address: 172.25.0.11
18-
thumbor:
19-
networks:
20-
hc-network:
21-
ipv4_address: 172.25.0.13
16+
- hc-network
17+
2218
maildev:
2319
image: djfarrelly/maildev
2420
networks:
2521
- hc-network
2622
ports:
2723
- "1080:80"
2824
- "1025:25"
25+
2926
thumbor:
27+
container_name: thumbor
28+
hostname: thumbor
3029
image: apsl/thumbor
3130
networks:
3231
- hc-network
@@ -35,9 +34,7 @@ services:
3534

3635
networks:
3736
hc-network:
37+
name: hc-network
3838
driver: bridge
3939
ipam:
4040
driver: default
41-
config:
42-
-
43-
subnet: 172.25.0.0/16

‎docker-compose.yml

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
1-
version: '3'
1+
version: '3.5'
22

33
services:
44
api:
5+
container_name: api
6+
hostname: api
57
build: .
68
depends_on:
79
- mongo
810
networks:
911
- hc-network
12+
1013
mongo:
1114
image: mongo
1215
networks:
1316
- hc-network
1417
command: "--smallfiles --logpath=/dev/null"
1518

19+
dns-proxy-server:
20+
image: defreitas/dns-proxy-server
21+
volumes:
22+
- "/var/run/docker.sock:/var/run/docker.sock"
23+
- "/etc/resolv.conf:/etc/resolv.conf"
24+
ports:
25+
- 5380:5380
26+
hostname: dns.mageddo
27+
networks:
28+
- hc-network
29+
1630
networks:
1731
hc-network:
32+
name: hc-network
33+
driver: bridge
34+
ipam:
35+
driver: default

0 commit comments

Comments
 (0)