fix(config): stop using envc; interferes with docker --env-file (#1833)…

… r=vladikoff

config/dev.json

@@ -0,0 +1,32 @@
+{
+  "contentServer": {
+    "url": "http://127.0.0.1:3030"
+  },
+  "customsUrl": "none",
+  "lockoutEnabled": true,
+  "log": {
+    "fmt": "pretty",
+    "level": "info"
+  },
+  "sms": {
+    "isStatusGeoEnabled": false
+  },
+  "smtp": {
+    "host": "127.0.0.1",
+    "port": 9999,
+    "secure": false
+  },
+  "snsTopicArn": "disabled",
+  "statsd": {
+    "sample_rate": 1
+  },
+  "verificationReminders": {
+    "rate": 1
+  },
+  "verifierVersion": 0,
+  "securityHistory": {
+    "ipProfiling": {
+      "allowedRecency": 0
+    }
+  }
+}

config/index.js

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-require('envc')()
-
 var fs = require('fs')
 var path = require('path')
 var url = require('url')
@@ -757,7 +755,9 @@ var conf = convict({
 // files to process, which will be overlayed in order, in the CONFIG_FILES
 // environment variable.
 
-var files = (process.env.CONFIG_FILES || '').split(',').filter(fs.existsSync)
+var envConfig = path.join(__dirname, conf.get('env') + '.json')
+envConfig = envConfig + ',' + (process.env.CONFIG_FILES || '')
+var files = envConfig.split(',').filter(fs.existsSync)
 conf.loadFile(files)
 conf.validate({ strict: true })
 

package.json

@@ -41,7 +41,6 @@
     "buffer-equal-constant-time": "1.0.1",
     "convict": "2.0.0",
     "email-addresses": "2.0.2",
-    "envc": "2.4.0",
     "fxa-geodb": "0.0.8",
     "fxa-jwtool": "0.7.1",
     "fxa-shared": "1.0.4",