From 6ee9b365416877ad6552855108930a6f3fc722e8 Mon Sep 17 00:00:00 2001 From: Michael Both Date: Sat, 20 Oct 2018 17:29:03 +0200 Subject: [PATCH 1/4] Rename config for docker --- config/default-docker.json | 5 ----- config/development.json | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 config/default-docker.json create mode 100644 config/development.json diff --git a/config/default-docker.json b/config/default-docker.json deleted file mode 100644 index c2a7666..0000000 --- a/config/default-docker.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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/development.json b/config/development.json new file mode 100644 index 0000000..29c1214 --- /dev/null +++ b/config/development.json @@ -0,0 +1,15 @@ +{ + "baseURL": "http://api.127.0.0.1.xip.io:3030", + "frontURL": "http://webapp.127.0.0.1.xip.io:3030", + "mongodb": "mongodb://mongo:27017/hc_api", + "host": "0.0.0.0", + "authentication": { + "jwt": { + "audience": "http://webapp.127.0.0.1.xip.io:3030" + } + }, + "seeder": { + "runOnInit": true, + "dropDatabase": false + } +} From 5a168d2142dc43c036638be5b88dac55550a0605 Mon Sep 17 00:00:00 2001 From: Michael Both Date: Thu, 22 Nov 2018 16:14:36 +0100 Subject: [PATCH 2/4] Rename docker default config --- config/{development.json => default-docker.json} | 2 +- docker-compose.override.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename config/{development.json => default-docker.json} (92%) diff --git a/config/development.json b/config/default-docker.json similarity index 92% rename from config/development.json rename to config/default-docker.json index 29c1214..0518e12 100644 --- a/config/development.json +++ b/config/default-docker.json @@ -9,7 +9,7 @@ } }, "seeder": { - "runOnInit": true, + "runOnInit": false, "dropDatabase": false } } diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 06387fa..aedec78 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -4,6 +4,7 @@ services: api: environment: - NODE_ENV=development + - NODE_APP_INSTANCE=docker ports: - "3030:3030" - "9229:9229" # node inspect From ae96ef88e34146d696b92fedf4f462d11d250057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 30 Nov 2018 18:25:09 +0100 Subject: [PATCH 3/4] Remove redundancy --- config/default-docker.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/default-docker.json b/config/default-docker.json index 0518e12..f0a3bef 100644 --- a/config/default-docker.json +++ b/config/default-docker.json @@ -7,9 +7,5 @@ "jwt": { "audience": "http://webapp.127.0.0.1.xip.io:3030" } - }, - "seeder": { - "runOnInit": false, - "dropDatabase": false } } From 4a342bcb5983bacb7e6843acc4b3745867c16768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 30 Nov 2018 18:26:51 +0100 Subject: [PATCH 4/4] Remove redundant `NODE_APP_INSTANCE` While it is important to have it set in the docker container, I would not add it additionally in `docker-compose.yml` because other developer might believe, it is necessary to have it there. --- docker-compose.override.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index aedec78..06387fa 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -4,7 +4,6 @@ services: api: environment: - NODE_ENV=development - - NODE_APP_INSTANCE=docker ports: - "3030:3030" - "9229:9229" # node inspect