Merge pull request #755 from jembi/deploy-fixes

Fix metrics docker build

Author: euanmillar

packages/metrics/package.json

@@ -16,11 +16,12 @@
   },
   "dependencies": {
     "@types/boom": "^7.2.0",
+    "@types/fhir": "^0.0.30",
     "@types/hapi": "^17.0.12",
     "@types/hapi-auth-jwt2": "^8.0.1",
+    "@types/joi": "^14.0.0",
     "@types/jsonwebtoken": "^8.3.0",
     "@types/jwt-decode": "^2.2.1",
-    "@types/joi": "^14.0.0",
     "@types/node-fetch": "^2.1.2",
     "app-module-path": "^2.2.0",
     "boom": "^7.2.0",
@@ -30,13 +31,13 @@
     "hapi": "^17.5.1",
     "hapi-auth-jwt2": "^8.1.0",
     "influx": "^5.0.7",
+    "joi": "^13.4.0",
     "jsonwebtoken": "^8.3.0",
     "jwt-decode": "^2.2.0",
-    "joi": "^13.4.0",
+    "moment": "^2.22.2",
     "node-fetch": "^2.3.0",
     "typescript": "^3.0.1",
-    "winston": "^3.0.0",
-    "moment": "^2.22.2"
+    "winston": "^3.0.0"
   },
   "devDependencies": {
     "cross-env": "^5.2.0",

yarn.lock

@@ -341,6 +341,7 @@
 "@types/fhir@^0.0.30":
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/@types/fhir/-/fhir-0.0.30.tgz#a0aec3b2d7dd2a7584474dac446ede5f9a4d7a13"
+  integrity sha512-vDU62tUFeAYBVQThiWAfGd6D25TiLLDDS5pV19vim52FLpwWTBliLMvotbF4D/U+BmjxBKIuHGZgFnoh/HtV5g==
 
 "@types/geojson@^7946.0.4":
   version "7946.0.6"