Merge pull request #259 from DanielGallo:dev-v3

Updates for WebDashboard

Author: britkat1980

Dockerfile

@@ -12,7 +12,7 @@ RUN apk add redis
 RUN apk add nginx
 
 RUN mkdir -p /run/nginx
-RUN npm install -g serve
+RUN npm install -g http-server
 
 # set the working directory in the container
 WORKDIR /app
@@ -43,6 +43,6 @@ COPY redis.conf redis.conf
 COPY settings.json ./settings.json
 COPY ingress/ ./ingress
 
-EXPOSE 1883 6379 8099
+EXPOSE 1883 3000 6379 8099
 
 CMD ["python3", "/app/startup.py"]

WebDashboard

@@ -625,7 +625,7 @@ def findinv(networks):
         outp.write("}")
     WDPORT=int(setts['Web_Dash_Port'])
     logger.info ("Serving Web Dashboard from port "+str(WDPORT))
-    command=shlex.split("/usr/bin/node /usr/local/bin/serve -p "+ str(WDPORT))
+    command=shlex.split("/usr/bin/node /usr/local/bin/http-server -p "+ str(WDPORT))
     webDash=subprocess.Popen(command)
 
 
@@ -678,7 +678,7 @@ def findinv(networks):
                 os.chdir("/app/WebDashboard")
                 WDPORT = int(setts['Web_Dash_Port'])
                 logger.info("Serving Web Dashboard from port " + str(WDPORT))
-                command = shlex.split("/usr/bin/node /usr/local/bin/serve -p " + str(WDPORT))
+                command = shlex.split("/usr/bin/node /usr/local/bin/http-server -p " + str(WDPORT))
                 webDash = subprocess.Popen(command)
 
         if setts['MQTT_Address']=="127.0.0.1":