Update docker demo script.

Author: riclolsen

demo-docker/README.md

@@ -38,7 +38,7 @@ docker-compose -f docker-compose.yaml up
 
 Wait until images are pulled, the databases are seeded and the protocol communication begins.
 
-Open http://localhost:8080 on a browser (Chrome, Safari or Firefox).
+Open http://127.0.0.1/login/login.html on a browser (Chrome, Safari or Firefox).
 
 Login credentials are user="admin" and password="jsonscada".
 

demo-docker/docker-compose.yaml

@@ -110,23 +110,23 @@ services:
     volumes: 
       - ./grafana_data:/var/lib/grafana
     environment: 
-      - GF_SERVER_DOMAIN=127.0.0.1
+      - GF_SERVER_DOMAIN=grafana
       - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:8080/grafana/
       - GF_SERVER_SERVE_FROM_SUB_PATH=false
       - GF_AUTH_PROXY_ENABLED=true
       - GF_AUTH_PROXY_ENABLE_LOGIN_TOKEN=true
       - GF_AUTH_DISABLE_SIGNOUT_MENU=true
-      - GF_AUTH_PROXY_WHITELIST=127.0.0.1
+      # - GF_AUTH_PROXY_WHITELIST=127.0.0.1
       - GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION=true
-      - GF_SERVER_HTTP_ADDR="127.0.0.1"
+      - GF_SERVER_HTTP_ADDR=0.0.0.0
       - GF_SERVER_ENFORCE_DOMAIN=true
       - GF_SERVER_ENABLE_GZIP=true
       - GF_ANALYTICS_REPORTING_ENABLED=false
       - GF_ANALYTICS_CHECK_FOR_UPDATES=false
       - GF_SECURITY_ALLOW_EMBEDDING=true
       - GF_DATABASE_TYPE=postgres
       - GF_DATABASE_NAME=grafanaappdb
-      - GF_DATABASE_HOST=127.0.0.1
+      - GF_DATABASE_HOST=timescaledb:5432
       - GF_DATABASE_USER=postgres
       - GF_DATABASE_PASSWORD=
       #- GF_AUTH_PROXY_HEADER_NAME=X-WEBAUTH-USER
@@ -138,7 +138,7 @@ services:
       - 3000:3000
     expose:
       - "3000"
-    links:
+    depends_on:
       - timescaledb
     networks:
       - jsdemo_net
@@ -240,7 +240,6 @@ services:
     networks:
       - jsdemo_net
 
-
   # OPC-UA Server
   opcua_server:
     image: node:20-alpine
@@ -259,36 +258,6 @@ services:
     networks:
       - jsdemo_net
 
-  # realtime web server, will listen on some HTTP port NO AUTH/RBAC
-  #server_realtime:
-  #  image: node:20-alpine
-  #  container_name: jsdemo_server_realtime
-  #  command:  sh -c "cd /server_realtime && sleep 10 && node index.js"
-  #  restart: unless-stopped
-  #  environment:
-  #    - JS_IP_BIND=0.0.0.0
-  #    - JS_HTTP_PORT=8080
-  #    - JS_GRAFANA_SERVER=http://jsdemo_grafana:3000
-  #    - JS_AUTHENTICATION=NOAUTH
-  #    - PGPORT=5432
-  #    - PGHOST=jsdemo_timescaledb
-  #    - PGDATABASE=json_scada
-  #    - PGUSER=json_scada
-  #    - PGPASSWORD=
-  #  volumes:
-  #    - ../src/server_realtime:/server_realtime
-  #    - ../src/htdocs:/htdocs
-  #    - ./conf:/conf
-  #  links:
-  #    - jsdemo_mongorsn1
-  #  # exports the HTTP port to the main host
-  #  ports:
-  #    - 8080:8080
-  #  expose:
-  #    - "8080"
-  #  networks:
-  #    - jsdemo_net
-
   # realtime web server, will listen on some HTTP port with auth, RBAC management UI
   server_realtime:
     image: node:20-alpine
@@ -298,7 +267,7 @@ services:
     environment:
       - JS_IP_BIND=0.0.0.0
       - JS_HTTP_PORT=8080
-      - JS_GRAFANA_SERVER=http://jsdemo_grafana:3000
+      - JS_GRAFANA_SERVER=http://grafana:3000
       - PGPORT=5432
       - PGHOST=jsdemo_timescaledb
       - PGDATABASE=json_scada
@@ -312,6 +281,7 @@ services:
       - ./conf:/conf
     links:
       - jsdemo_mongorsn1
+      - grafana
     # exports the HTTP port to the main host
     ports:
       - 8080:8080
@@ -337,7 +307,7 @@ services:
  # Dnp3 client: requires wine as it is currently Windows-only
   dnp3_client_wine:
     image: scottyhardy/docker-wine:latest  
-    container_name: js_dnp3_client_wine   
+    container_name: jsdemo_dnp3_client_wine   
     command: sh -c "cd /jsonscada_bin/ && sleep 30 && xvfb-run wine Dnp3Client.exe 1 1"
     restart: unless-stopped
     links:
@@ -351,7 +321,7 @@ services:
 #  # another option via proton-ge
 #  dnp3_client_wine:
 #    image: mtapiio/wine8:latest
-#    container_name: js_dnp3_client_wine
+#    container_name: jsdemo_dnp3_client_wine
 #    command: sh -c "dpkg --add-architecture i386 &&          
 #                    apt update && apt dist-upgrade -y &&
 #                    apt install -y libc6:i386 libx11-6:i386 libdbus-1-dev:i386 libfreetype6:i386 &&
@@ -390,6 +360,26 @@ services:
 #    networks:
 #      - jsdemo_net
 
+  nginx:
+    image: nginx:latest
+    container_name: jsdemo_nginx
+    ports:
+      - "80:80"
+    expose:
+      - "80"
+    volumes:
+      - ./conf/nginx.conf:/etc/nginx/nginx.conf
+      - ./conf/fastcgi.conf:/etc/nginx/fastcgi.conf
+      - ./conf/nginx-conf.d:/etc/nginx/conf.d
+      - ../src/htdocs:/htdocs
+      - ../src/htdocs-admin:/htdocs-admin
+      - ../src/htdocs-login:/htdocs-login
+    restart: unless-stopped
+    links:
+      - server_realtime
+    networks:
+      - jsdemo_net
+
 networks:
   jsdemo_net:
     driver: bridge