fix(syncserver): Configure syncserver to use localhost verifier. mozilla/fxa-local-dev#114)

Fixes mozilla/fxa-local-dev#112

.travis.yml

@@ -18,6 +18,7 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - g++-4.8
+    - docker-ce
 
 env:
   matrix:

_scripts/install_all.sh

@@ -16,7 +16,7 @@ git clone https://github.com/mozilla/fxa-auth-db-mysql.git &
 
 git clone https://github.com/mozilla/fxa-customs-server.git &
 
-git clone https://github.com/vladikoff/browserid-verifier.git -b http &
+git clone https://github.com/mozilla/browserid-verifier.git &
 
 git clone https://github.com/mozilla/fxa-oauth-server.git &
 git clone https://github.com/mozilla/fxa-oauth-console.git &
@@ -38,8 +38,7 @@ cd fxa-auth-server; npm i; node ./scripts/gen_keys.js; node ./scripts/gen_vapid_
 
 cd fxa-auth-db-mysql; npm i; cd ..
 
-# Install a custom http only verifier
-cd browserid-verifier; npm i; npm i vladikoff/browserid-local-verify#http; cd ..
+cd browserid-verifier; npm i; cd ..
 
 cd fxa-oauth-server; npm i; cd ..
 

_scripts/syncserver.sh

@@ -1,8 +1,17 @@
 #!/bin/sh -ex
 
-docker run --rm --name syncserver \
+DOCKER_OS="`docker info --format '{{.OperatingSystem}}'`"
+
+if [ "$DOCKER_OS" = 'Docker for Windows' -o "$DOCKER_OS" = 'Docker for Mac' ]; then
+  HOST_ADDR='host.docker.internal'
+else
+  HOST_ADDR='127.0.0.1'
+fi
+
+docker run --net=host --rm --name syncserver \
   -p 5000:5000 \
   -e SYNCSERVER_PUBLIC_URL=http://localhost:5000 \
+  -e SYNCSERVER_BROWSERID_VERIFIER=http://$HOST_ADDR:5050 \
   -e SYNCSERVER_SECRET=5up3rS3kr1t \
   -e SYNCSERVER_SQLURI=sqlite:////tmp/syncserver.db \
   -e SYNCSERVER_BATCH_UPLOAD_ENABLED=true \

servers.json

@@ -130,7 +130,8 @@
       "cwd": "browserid-verifier",
       "env": {
         "PORT": "5050",
-        "IP_ADDRESS": "0.0.0.0"
+        "IP_ADDRESS": "0.0.0.0",
+        "FORCE_INSECURE_LOOKUP_OVER_HTTP": "true"
       },
       "max_restarts": "1",
       "min_uptime": "2m"