Updated docker-compose and README

README.md

@@ -18,8 +18,7 @@
 * Clone repo `git clone git@github.com:UN-OCHA/hid_app2.git`
 * In the app directory `cd hid_app2`
 * Switch to the dev branch `git checkout dev`
-* Install node modules `npm install`
-* Install Bower modules `bower install`
+* Install node modules with yarn `yarn install`
 * Add the local url to your hosts file:
 on Mac: `sudo vi /etc/hosts`
 Add `127.0.0.1   app.hid.vm`
@@ -28,13 +27,8 @@ Add `127.0.0.1   app.hid.vm`
 
 ### Running the app
 
-* If you are using Docker for Mac you will need to add ports to docker-compose.yml
-	```
-	ports:
-   	- 80:80
-  ```
 * `docker-compose up`
-* visit [http://app.hid.vm](http://app.hid.vm)
+* visit [https://app.hid.vm](https://app.hid.vm) and accept the SSL certificate exception
 
 ## Deployment
 

docker-compose.yml

@@ -1,12 +1,9 @@
 app:
   image: unocha/alpine-base-nginx
-  environment:
-    DNSDOCK_NAME: app
-    DNSDOCK_IMAGE: hid
   volumes:
     - ./dist:/srv/www/html
     - ./conf/nginx/default.conf:/etc/nginx/conf.d/default.conf
     - ./conf/nginx/ssl:/etc/nginx/ssl
-  hostname: app.hid.vm
+#  hostname: app.hid.vm
   ports:
-    - 80:80
+    - 443:443

package.json

@@ -83,11 +83,11 @@
     "@bower_components/jquery": "jquery/jquery-dist#1.9.1 - 3",
     "@bower_components/karma-read-json": "pizzapanther/Karma-Read-JSON#^1.1.0",
     "@bower_components/localforage": "mozilla/localForage#~1.4",
+    "@bower_components/microsoft-graph-client": "microsoftgraph/msgraph-sdk-javascript#^1.0.0",
     "@bower_components/moment": "moment/moment#>= 2.9.0",
     "@bower_components/moment-timezone": "moment/moment-timezone#~0.5.9",
     "@bower_components/offline": "HubSpot/offline#~0.7.18",
-    "@bower_components/ua-parser-js": "faisalman/ua-parser-js#^0.7.17",
-    "@bower_components/microsoft-graph-client": "microsoftgraph/msgraph-sdk-javascript#^1.0.0"
+    "@bower_components/ua-parser-js": "faisalman/ua-parser-js#^0.7.17"
   },
   "engines": {
     "yarn": ">= 1.0.0"