Added Dnp3 client that can run under Wine/Proton to the demo-docker s…

…cript.
riclolsen · Jun 25, 2023 · a9518ba · a9518ba
1 parent ca00e70
commit a9518ba
Showing 1 changed file with 31 additions and 19 deletions.
diff --git a/demo-docker/docker-compose.yaml b/demo-docker/docker-compose.yaml
@@ -100,7 +100,7 @@ services:
       - jsdemo_net
 
   grafana:
-    image: grafana/grafana:latest
+    image: grafana/grafana:9.5.5
     container_name: jsdemo_grafana
     # you may need to set the docker user:group to be able to write grafana folder 
     # set UID and GID variables 
@@ -132,7 +132,7 @@ services:
     networks:
       - jsdemo_net
 
-  # IEC6079-5-104 CLIENT, will connect to a demo server on 207.180.242.96:2404
+  # IEC60870-5-104 CLIENT, will connect to a demo server on 207.180.242.96:2404
   iec104client:
     image: mcr.microsoft.com/dotnet/sdk:6.0
     container_name: jsdemo_iec104client
@@ -146,7 +146,7 @@ services:
     networks:
       - jsdemo_net
 
-  # IEC6079-5-104 SERVER, accepts connection on 127.0.0.1:2404 (originator address 1)
+  # IEC60870-5-104 SERVER, accepts connection on 127.0.0.1:2404 (originator address 1)
   iec104server:
     image: mcr.microsoft.com/dotnet/sdk:6.0
     container_name:  jsdemo_iec104server
@@ -323,23 +323,35 @@ services:
     networks:
       - jsdemo_net
 
-# dnp3_client_wine:
-#   #image: tianon/wine:latest
-#   image: scottyhardy/docker-wine:devel-6.12-nordp
-#   container_name: js_dnp3_client_wine
-#   #command: sh -c "wget https://download.visualstudio.microsoft.com/download/pr/474a078c-f415-4bae-8571-2fe8ea37ed51/a8ac1fe825f63411c375633bd98205c4/dotnet-sdk-5.0.302-win-x64.exe &&
-#   #                chmod +x dotnet-sdk-5.0.302-win-x64.exe
-#   #                wineboot -u &&
-#   #                winetricks vcrun2019
-#   #                wine dotnet-sdk-5.0.302-win-x64.exe /install /quiet && wine "/root/.wine/drive_c/dotnet-sdk-5.0.302-win-x64.exe" "/install" "/quiet"
-#   #                cd /src/dnp3/Dnp3Client/ && 
-#   #                wine dotnet publish --runtime win-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/"
-#   command: tail -f /dev/null
-#   volumes:
-#     - ./conf:/conf
-#     - ./bin_win:/jsonscada_bin
+#  # Dnp3 client: requires wine/proton as it is currently Windows-only
+#  dnp3_client_wine:
+#    image: mtapiio/wine8:latest
+#    container_name: js_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 &&
+#                    apt install -y nano xvfb python3-pip wget libfreetype6 &&
+#                    export WINEDEBUG=-all &&
+#                    pip3 install protonup &&
+#                    rm -rf /tmp/.X0-lock &&
+#                    (Xvfb :0 -screen 0 1024x768x16 &) &&
+#                    export DISPLAY=:0.0 &&
+#                    cd /root &&
+#                    wget -nc https://download.visualstudio.microsoft.com/download/pr/7bb7f85b-9bf0-4c6f-b3e4-a3832720f162/73e280cfd7f686c34748e0bf98d879c7/dotnet-runtime-6.0.19-win-x64.exe &&
+#                    sleep 2 &&
+#                    protonup -y &&
+#                    echo 555337b3129e4544846342bd94c9a8ac > /etc/machine-id &&
+#                    /root/.steam/root/compatibilitytools.d/GE-Proton8-4/files/bin/wine64 dotnet-runtime-6.0.19-win-x64.exe /q &&
+#                    /root/.steam/root/compatibilitytools.d/GE-Proton8-4/files/bin/wine64 ../jsonscada_bin/Dnp3Client.exe "
+#    volumes:
+#      - ./conf:/conf
+#      - ./bin_win:/jsonscada_bin
+#    links:
+#      - jsdemo_mongorsn1
+#    networks:
+#      - jsdemo_net
 
-## Metabase for dashboards (can connect to MONGODB and POSTGRESQL)
+#  # Metabase for dashboards (can connect to MONGODB and POSTGRESQL)
 #  metabase:
 #    image: metabase/metabase:latest
 #    container_name: jsdemo_metabase