From 2de179fc8ce30e2f86c258bb00c81abae424f218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 29 Sep 2018 15:12:27 +0200 Subject: [PATCH 1/5] Solve container names by hostname with dns proxy --- config/default-docker.json | 1 + config/local-staging-docker.json | 5 ++--- docker-compose.override.yml | 2 +- docker-compose.staging.yml | 19 ++++++++----------- docker-compose.yml | 20 +++++++++++++++++++- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/config/default-docker.json b/config/default-docker.json index 3db818c..03d1a03 100644 --- a/config/default-docker.json +++ b/config/default-docker.json @@ -1,4 +1,5 @@ { + "baseURL": "http://api:3030", "mongodb": "mongodb://mongo:27017/hc_api", "host": "0.0.0.0" } diff --git a/config/local-staging-docker.json b/config/local-staging-docker.json index 3c81e30..fbe1231 100644 --- a/config/local-staging-docker.json +++ b/config/local-staging-docker.json @@ -1,8 +1,7 @@ { - "baseURL": "http://172.25.0.11:3030", "seeder": { "runOnInit": true, - "dropDatabase": true + "dropDatabase": false }, "smtpConfig": { "host": "maildev", @@ -10,7 +9,7 @@ "ignoreTLS": true }, "thumbor": { - "url": "http://localhost:8000", + "url": "http://thumbor:8000", "key": "" } } diff --git a/docker-compose.override.yml b/docker-compose.override.yml index d128314..06387fa 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,4 +1,4 @@ -version: '3' +version: '3.5' services: api: diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 52222f2..500b214 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -1,8 +1,8 @@ -version: '3' +version: '3.5' services: api: - image: humanconnection/api-feathers + image: humanconnection/api-feathers:edge build: context: . environment: @@ -13,12 +13,8 @@ services: ports: - "3030:3030" networks: - hc-network: - ipv4_address: 172.25.0.11 - thumbor: - networks: - hc-network: - ipv4_address: 172.25.0.13 + - hc-network + maildev: image: djfarrelly/maildev networks: @@ -26,7 +22,10 @@ services: ports: - "1080:80" - "1025:25" + thumbor: + container_name: thumbor + hostname: thumbor image: apsl/thumbor networks: - hc-network @@ -35,9 +34,7 @@ services: networks: hc-network: + name: hc-network driver: bridge ipam: driver: default - config: - - - subnet: 172.25.0.0/16 diff --git a/docker-compose.yml b/docker-compose.yml index d928c5a..0970c9c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,35 @@ -version: '3' +version: '3.5' services: api: + container_name: api + hostname: api build: . depends_on: - mongo networks: - hc-network + mongo: image: mongo networks: - hc-network command: "--smallfiles --logpath=/dev/null" + dns-proxy-server: + image: defreitas/dns-proxy-server + volumes: + - "/var/run/docker.sock:/var/run/docker.sock" + - "/etc/resolv.conf:/etc/resolv.conf" + ports: + - 5380:5380 + hostname: dns.mageddo + networks: + - hc-network + networks: hc-network: + name: hc-network + driver: bridge + ipam: + driver: default From 704f48cee9fbeba85ff67d9df2c0dc0f0c5150b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Sat, 29 Sep 2018 20:15:21 +0200 Subject: [PATCH 2/5] Lower the verbosity of dns-proxy-server --- dns-proxy-server.config.json | 15 +++++++++++++++ docker-compose.yml | 1 + 2 files changed, 16 insertions(+) create mode 100644 dns-proxy-server.config.json diff --git a/dns-proxy-server.config.json b/dns-proxy-server.config.json new file mode 100644 index 0000000..c1f7b9d --- /dev/null +++ b/dns-proxy-server.config.json @@ -0,0 +1,15 @@ +{ + "remoteDnsServers": [], + "envs": [ + { + "name": "" + } + ], + "activeEnv": "", + "lastId": 0, + "webServerPort": 0, + "dnsServerPort": 0, + "defaultDns": null, + "logLevel": "WARNING", + "logFile": "" +} diff --git a/docker-compose.yml b/docker-compose.yml index 0970c9c..d6e5644 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,7 @@ services: volumes: - "/var/run/docker.sock:/var/run/docker.sock" - "/etc/resolv.conf:/etc/resolv.conf" + - "./dns-proxy-server.config.json:/app/conf/config.json" ports: - 5380:5380 hostname: dns.mageddo From 0cb0a8b4e16cf846c12e3ed4e8acc5acb62501b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 1 Oct 2018 11:41:14 +0200 Subject: [PATCH 3/5] Remove redundant network config (it's the default) --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d6e5644..08e85a6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,3 @@ services: networks: hc-network: name: hc-network - driver: bridge - ipam: - driver: default From 3cc34fa85813622d4d02b9edd1cc464c06c52fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 1 Oct 2018 12:30:11 +0200 Subject: [PATCH 4/5] Incorporate @ionphractal 's feedback, thanks :+1: See: https://github.com/Human-Connection/API/pull/169#issuecomment-425732252 --- config/default-docker.json | 2 +- config/local-staging-docker.json | 2 +- docker-compose.staging.yml | 10 +--------- docker-compose.yml | 25 ++++++++++++------------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/config/default-docker.json b/config/default-docker.json index 03d1a03..c2a7666 100644 --- a/config/default-docker.json +++ b/config/default-docker.json @@ -1,5 +1,5 @@ { - "baseURL": "http://api:3030", + "baseURL": "http://api.127.0.0.1.xip.io:3030", "mongodb": "mongodb://mongo:27017/hc_api", "host": "0.0.0.0" } diff --git a/config/local-staging-docker.json b/config/local-staging-docker.json index fbe1231..c4902bf 100644 --- a/config/local-staging-docker.json +++ b/config/local-staging-docker.json @@ -9,7 +9,7 @@ "ignoreTLS": true }, "thumbor": { - "url": "http://thumbor:8000", + "url": "http://thumbor.127.0.0.1.xip.io:8000", "key": "" } } diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 500b214..04816f7 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -24,17 +24,9 @@ services: - "1025:25" thumbor: - container_name: thumbor - hostname: thumbor + container_name: thumbor.127.0.0.1.xip.io image: apsl/thumbor networks: - hc-network ports: - "8000:8000" - -networks: - hc-network: - name: hc-network - driver: bridge - ipam: - driver: default diff --git a/docker-compose.yml b/docker-compose.yml index 08e85a6..6f656bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,7 @@ version: '3.5' services: api: - container_name: api - hostname: api + container_name: api.127.0.0.1.xip.io build: . depends_on: - mongo @@ -16,17 +15,17 @@ services: - hc-network command: "--smallfiles --logpath=/dev/null" - dns-proxy-server: - image: defreitas/dns-proxy-server - volumes: - - "/var/run/docker.sock:/var/run/docker.sock" - - "/etc/resolv.conf:/etc/resolv.conf" - - "./dns-proxy-server.config.json:/app/conf/config.json" - ports: - - 5380:5380 - hostname: dns.mageddo - networks: - - hc-network + # dns-proxy-server: + # image: defreitas/dns-proxy-server + # volumes: + # - "/var/run/docker.sock:/var/run/docker.sock" + # - "/etc/resolv.conf:/etc/resolv.conf" + # - "./dns-proxy-server.config.json:/app/conf/config.json" + # ports: + # - 5380:5380 + # hostname: dns.mageddo + # networks: + # - hc-network networks: hc-network: From a7a78c94db0111f64100473ade4768241d6c470e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 1 Oct 2018 12:47:48 +0200 Subject: [PATCH 5/5] Clean up proxy-dns-server config --- dns-proxy-server.config.json | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 dns-proxy-server.config.json diff --git a/dns-proxy-server.config.json b/dns-proxy-server.config.json deleted file mode 100644 index c1f7b9d..0000000 --- a/dns-proxy-server.config.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "remoteDnsServers": [], - "envs": [ - { - "name": "" - } - ], - "activeEnv": "", - "lastId": 0, - "webServerPort": 0, - "dnsServerPort": 0, - "defaultDns": null, - "logLevel": "WARNING", - "logFile": "" -}