From 18dae9dc5a9d564fe497607aa581c5fc94429137 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 27 Sep 2019 15:36:55 +0100 Subject: [PATCH] Update to node 10, and move to package-lock.json --- services/chat/Dockerfile | 4 +- services/chat/docker-compose.yml | 4 +- ...{npm-shrinkwrap.json => package-lock.json} | 42 +++++++++++-------- 3 files changed, 28 insertions(+), 22 deletions(-) rename services/chat/{npm-shrinkwrap.json => package-lock.json} (99%) diff --git a/services/chat/Dockerfile b/services/chat/Dockerfile index d3c288c077..f95dba1f7d 100644 --- a/services/chat/Dockerfile +++ b/services/chat/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.14.1 as app +FROM node:10.16.3 as app WORKDIR /app @@ -11,7 +11,7 @@ COPY . /app -FROM node:6.14.1 +FROM node:10.16.3 COPY --from=app /app /app diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml index fb33959c8a..960e25433f 100644 --- a/services/chat/docker-compose.yml +++ b/services/chat/docker-compose.yml @@ -7,7 +7,7 @@ version: "2" services: test_unit: - image: node:6.14.1 + image: node:10.16.3 volumes: - .:/app working_dir: /app @@ -51,5 +51,3 @@ services: mongo: image: mongo:3.4 - - diff --git a/services/chat/npm-shrinkwrap.json b/services/chat/package-lock.json similarity index 99% rename from services/chat/npm-shrinkwrap.json rename to services/chat/package-lock.json index 9a174ffba7..31cc151fae 100644 --- a/services/chat/npm-shrinkwrap.json +++ b/services/chat/package-lock.json @@ -308,9 +308,9 @@ "integrity": "sha1-lpFbqgXmpqHRN7rfSYTT/AWCC7Y=" }, "@sinonjs/commons": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.4.0.tgz", - "integrity": "sha512-9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.6.0.tgz", + "integrity": "sha512-w4/WHG7C4WWFyE5geCieFJF6MZkbW4VAriol5KlmQXpAQdxvV0p26sqNZOW6Qyw6Y0l9K4g+cHvvczR2sEEpqg==", "requires": { "type-detect": "4.0.8" } @@ -325,13 +325,20 @@ } }, "@sinonjs/samsam": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.2.tgz", - "integrity": "sha512-ILO/rR8LfAb60Y1Yfp9vxfYAASK43NFC2mLzpvLUbCQY/Qu8YwReboseu8aheCEkyElZF2L2T9mHcR2bgdvZyA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", + "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", "requires": { - "@sinonjs/commons": "^1.0.2", + "@sinonjs/commons": "^1.3.0", "array-from": "^2.1.1", - "lodash": "^4.17.11" + "lodash": "^4.17.15" + }, + "dependencies": { + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + } } }, "@sinonjs/text-encoding": { @@ -3758,7 +3765,8 @@ "lodash": { "version": "4.17.11", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha1-s56mIp72B+zYniyN8SU2iRysm40=" + "integrity": "sha1-s56mIp72B+zYniyN8SU2iRysm40=", + "dev": true }, "lodash.memoize": { "version": "4.1.2", @@ -4571,9 +4579,9 @@ "dev": true }, "nise": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.1.tgz", - "integrity": "sha512-edFWm0fsFG2n318rfEnKlTZTkjlbVOFF9XIA+fj+Ed+Qz1laYW2lobwavWoMzGrYDHH1EpiNJgDfvGnkZztR/g==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.2.tgz", + "integrity": "sha512-/6RhOUlicRCbE9s+94qCUsyE+pKlVJ5AhIv+jEE7ESKwnbXqulKZ1FYU+XAtHHWE9TinYvAxDUJAb912PwPoWA==", "requires": { "@sinonjs/formatio": "^3.2.1", "@sinonjs/text-encoding": "^0.7.1", @@ -6566,16 +6574,16 @@ "dev": true }, "sinon": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.4.1.tgz", - "integrity": "sha512-7s9buHGHN/jqoy/v4bJgmt0m1XEkCEd/tqdHXumpBp0JSujaT4Ng84JU5wDdK4E85ZMq78NuDe0I3NAqXY8TFg==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", + "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", "requires": { "@sinonjs/commons": "^1.4.0", "@sinonjs/formatio": "^3.2.1", - "@sinonjs/samsam": "^3.3.2", + "@sinonjs/samsam": "^3.3.3", "diff": "^3.5.0", "lolex": "^4.2.0", - "nise": "^1.5.1", + "nise": "^1.5.2", "supports-color": "^5.5.0" }, "dependencies": {