Merge branch 'master' into renovate/node-10.x

autoai-org · Nov 11, 2018 · 2de6dd0 · 2de6dd0
2 parents afcd6a2 + 9539245
commit 2de6dd0
Show file tree

Hide file tree

Showing 21 changed files with 15,025 additions and 44 deletions.
diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
diff --git a/dashboard/package.json b/dashboard/package.json
@@ -38,7 +38,7 @@
     "copy-webpack-plugin": "4.6.0",
     "cross-spawn": "6.0.5",
     "css-loader": "1.0.1",
-    "eslint": "5.8.0",
+    "eslint": "5.9.0",
     "eslint-config-standard": "12.0.0",
     "eslint-friendly-formatter": "4.0.1",
     "eslint-loader": "2.1.1",

diff --git a/discovery/.gitignore b/discovery/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
-dist/
+dist/
+*.log
diff --git a/discovery/Dockerfile b/discovery/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:latest
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY package.json /usr/src/app/
+RUN npm install
+
+COPY . /usr/src/app
+RUN npm build
+
+EXPOSE 3000
+CMD ["npm", "start"]