diff --git a/client/.dockerignore b/client/.dockerignore index 1313ed6..cc2d280 100644 --- a/client/.dockerignore +++ b/client/.dockerignore @@ -1,6 +1,4 @@ node_modules/* -package-lock.json - Dockerfile .dockerignore **/.gitignore diff --git a/client/Dockerfile b/client/Dockerfile index 5f02753..8039ed2 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -1,7 +1,7 @@ FROM node:9 as builder WORKDIR /opt/app -COPY package.json ./ +COPY package.json package-lock.json ./ RUN npm install COPY . ./ diff --git a/client/package-lock.json b/client/package-lock.json index c981c8a..fba155c 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1035,9 +1035,9 @@ "dev": true }, "cached-path-relative": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz", - "integrity": "sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz", + "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==", "dev": true }, "camel-case": { @@ -1426,9 +1426,9 @@ "dev": true }, "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "file-type": { "version": "9.0.0", @@ -1750,7 +1750,7 @@ }, "jpgjs": { "version": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc", - "from": "github:makr28/jpgjs", + "from": "github:makr28/jpgjs#c83f107ad725b476a3441d20680a02590d8752cc", "dev": true }, "js-cookie": { @@ -1832,9 +1832,9 @@ } }, "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, "lodash.memoize": { @@ -1859,9 +1859,9 @@ "dev": true }, "marked": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz", - "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==" + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz", + "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==" }, "md5.js": { "version": "1.3.4", diff --git a/client/package.json b/client/package.json index 9bbaab1..3d390ec 100644 --- a/client/package.json +++ b/client/package.json @@ -9,7 +9,7 @@ "font-awesome": "^4.7.0", "ios-inner-height": "^1.0.3", "js-cookie": "^2.2.0", - "marked": "^0.4.0", + "marked": "^0.7.0", "mousetrap": "^1.6.2", "nprogress": "^0.2.0", "superagent": "^3.8.3"