Fix webpack build

Author: safchain

Dockerfile

@@ -1,6 +1,19 @@
-FROM node:10
+FROM skydive/skydive
+
 WORKDIR /usr/src/skydive-ui
+
+RUN apt-get -y update \
+    && apt-get -y install nodejs npm
+
 COPY package.json /usr/src/skydive-ui
+COPY package-lock.json /usr/src/skydive-ui
+COPY tsconfig.json /usr/src/skydive-ui
+COPY webpack.config.js /usr/src/skydive-ui
+COPY assets /usr/src/skydive-ui/assets
+COPY src /usr/src/skydive-ui/src
+COPY entry.sh /usr/src/skydive-ui
+
 RUN npm install
-COPY . .
-CMD [ "/usr/src/skydive-ui/node_modules/webpack-dev-server/bin/webpack-dev-server.js", "--host", "0.0.0.0" ]
+RUN npm run build
+
+ENTRYPOINT /usr/src/skydive-ui/entry.sh

entry.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f /dump.json ]; then
+    /usr/bin/skydive --conf /etc/skydive.yml analyzer &
+    sleep 15
+
+    /usr/bin/skydive client topology import --file /dump.json
+fi
+
+python3 -m http.server 8080 --directory dist/

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "topsky",
+  "name": "skydive-ui",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
@@ -69,8 +69,8 @@
     "webpack-dev-server": "^3.11.0"
   },
   "scripts": {
-    "start": "webpack serve --mode development --disable-host-check --host 0.0.0.0 --open-page=$PAGE",
-    "build": "webpack --mode production",
+    "start": "webpack serve --mode development --disable-host-check --host 0.0.0.0",
+    "build": "webpack",
     "test": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha -r ts-node/register tests/**/*.test.ts",
     "coverage": "nyc -r lcov -e .ts -x \"*.test.ts\" npm run test"
   }

webpack.config.js

@@ -1,6 +1,8 @@
 const HtmlWebPackPlugin = require("html-webpack-plugin");
 const CopyWebPackPlugin = require('copy-webpack-plugin');
 
+var path = require('path');
+
 const htmlPlugin = new HtmlWebPackPlugin({
     template: "./src/index.html",
     filename: "./index.html"
@@ -55,6 +57,9 @@ module.exports = {
 
     devServer: {
         historyApiFallback: true,
+        contentBase: path.join(__dirname, 'dist'),
+        compress: true,
+        port: 8080
     },
 
     devtool: "source-map",