Updated docker script for DNP3/wine.

riclolsen · Sep 15, 2024 · 6d6de6e · 6d6de6e
1 parent cd450d8
commit 6d6de6e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/demo-docker/docker-compose.yaml b/demo-docker/docker-compose.yaml
@@ -323,7 +323,21 @@ services:
     networks:
       - jsdemo_net
 
-#  # Dnp3 client: requires wine/proton as it is currently Windows-only
+ # Dnp3 client: requires wine as it is currently Windows-only
+  dnp3_client_wine:
+    image: scottyhardy/docker-wine:latest  
+    container_name: js_dnp3_client_wine   
+    command: sh -c "cd /jsonscada_bin/ && sleep 30 && xvfb-run wine Dnp3Client.exe 1 1"
+    restart: unless-stopped
+    links:
+      - jsdemo_mongorsn1   
+    volumes:
+      - ./conf:/conf
+      - ./bin_win:/jsonscada_bin
+    networks:
+     - jsdemo_net
+
+#  # another option via proton-ge
 #  dnp3_client_wine:
 #    image: mtapiio/wine8:latest
 #    container_name: js_dnp3_client_wine
@@ -343,6 +357,7 @@ services:
 #                    echo 555337b3129e4544846342bd94c9a8ac > /etc/machine-id &&
 #                    /root/.steam/root/compatibilitytools.d/GE-Proton8-4/files/bin/wine64 dotnet-runtime-8.0.7-win-x64.exe /q &&
 #                    /root/.steam/root/compatibilitytools.d/GE-Proton8-4/files/bin/wine64 ../jsonscada_bin/Dnp3Client.exe "
+#    restart: unless-stopped
 #    volumes:
 #      - ./conf:/conf
 #      - ./bin_win:/jsonscada_bin

diff --git a/demo-docker/mongo_seed/files/demo_connections.json b/demo-docker/mongo_seed/files/demo_connections.json
@@ -6,3 +6,4 @@
 {"_id":{"$oid":"6053887ea2e672638cc751d4"},"protocolDriver":"TELEGRAF-LISTENER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2001,"name":"TELEGRAFDEMO","description":"TELEGRAF Demo","enabled": true,"commandsEnabled":false,"ipAddresses":["127.0.0.1"],"ipAddressLocalBind":"0.0.0.0:51920","stats":null}
 {"_id":{"$oid":"6675d176e2f7917450d7585b"},"protocolDriver":"PLC4X","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2003,"name":"PLC1","description":"PLC #1 MODBUS","enabled":true,"commandsEnabled":true,"topics":["MBPLC1_HR1|holding-register:1:UINT","MBPLC1_10HRS|holding-register:2:INT[10]"],"autoCreateTags": true,"endpointURLs":["modbus-tcp://localhost:5001?unit-identifier=2"],"giInterval": 1.5,"stats":null}
 {"_id":{"$oid":"669ea9ce96e9a9fe7abe6ef8"},"protocolDriver":"OPC-DA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":5001,"name":"OPCDAClient1","description":"Download from demo server from https://github.com/technosoftware-gmbh/opcdaaehda-client-solution-net/tree/master/x86/DemoServer","enabled":true,"commandsEnabled":true,"stats":null,"endpointURLs":["opcda://localhost/SampleCompany.DaSample.30"],"autoCreateTags":true,"useSecurity":false,"autoCreateTagPublishingInterval":5,"autoCreateTagQueueSize":5,"autoCreateTagSamplingInterval":0,"giInterval":300,"localCertFilePath":"","peerCertFilePath":"","timeoutMs":20000,"topics":[],"deadBand":5,"hoursShift":0,"password":"","username":""}
+{"_id":{"$oid":"66e6c7d1311eee86fc6b4f07"},"protocolDriver":"DNP3","protocolDriverInstanceNumber":1,"protocolConnectionNumber":33,"name":"DNP3DEMO","description":"DNP3 DEMO","enabled": true,"commandsEnabled":true,"stats":null,"ipAddresses":["127.0.0.1:20000"],"passphrase":"","pfxFilePath":"","useSecurity":false,"timeoutMs":10000,"localLinkAddress":2,"remoteLinkAddress":1,"giInterval":300,"hoursShift":0,"timeSyncInterval":0,"localCertFilePath":"","peerCertFilePath":"","peerCertFilesPaths":[],"rootCertFilePath":"","chainValidation":false,"allowOnlySpecificCertificates":false,"privateKeyFilePath":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","connectionMode":"TCP Active","asyncOpenDelay":0,"timeSyncMode":0,"class0ScanInterval":0,"class1ScanInterval":0,"class2ScanInterval":0,"class3ScanInterval":0,"enableUnsolicited":true,"rangeScans":[],"baudRate":9600,"parity":"Even","stopBits":"One","handshake":"None","timeoutForACK":1000,"timeoutRepeat":1000}
diff --git a/demo-docker/mongo_seed/files/demo_connections_linux.json b/demo-docker/mongo_seed/files/demo_connections_linux.json
@@ -6,3 +6,4 @@
 {"_id":{"$oid":"6053887ea2e672638cc751d4"},"protocolDriver":"TELEGRAF-LISTENER","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2001,"name": "TELEGRAFDEMO","description":"TELEGRAF Demo","enabled": true,"commandsEnabled":false,"ipAddresses":["127.0.0.1"],"ipAddressLocalBind":"0.0.0.0:51920","stats":null}
 {"_id":{"$oid":"6675d176e2f7917450d7585b"},"protocolDriver":"PLC4X","protocolDriverInstanceNumber":1,"protocolConnectionNumber":2003,"name":"PLC1","description":"PLC #1 MODBUS","enabled":true,"commandsEnabled":true,"topics":["MBPLC1_HR1|holding-register:1:UINT","MBPLC1_10HRS|holding-register:2:INT[10]"],"autoCreateTags": true,"endpointURLs":["modbus-tcp://localhost:5001?unit-identifier=2"],"giInterval": 1.5,"stats":null}
 {"_id":{"$oid":"669ea9ce96e9a9fe7abe6ef8"},"protocolDriver":"OPC-DA","protocolDriverInstanceNumber":1,"protocolConnectionNumber":5001,"name":"OPCDAClient1","description":"Download from demo server from https://github.com/technosoftware-gmbh/opcdaaehda-client-solution-net/tree/master/x86/DemoServer","enabled":true,"commandsEnabled":true,"stats":null,"endpointURLs":["opcda://localhost/SampleCompany.DaSample.30"],"autoCreateTags":true,"useSecurity":false,"autoCreateTagPublishingInterval":5,"autoCreateTagQueueSize":5,"autoCreateTagSamplingInterval":0,"giInterval":300,"localCertFilePath":"","peerCertFilePath":"","timeoutMs":20000,"topics":[],"deadBand":5,"hoursShift":0,"password":"","username":""}
+{"_id":{"$oid":"66e6c7d1311eee86fc6b4f07"},"protocolDriver":"DNP3","protocolDriverInstanceNumber":1,"protocolConnectionNumber":33,"name":"DNP3DEMO","description":"DNP3 DEMO","enabled": true,"commandsEnabled":true,"stats":null,"ipAddresses":["127.0.0.1:20000"],"passphrase":"","pfxFilePath":"","useSecurity":false,"timeoutMs":10000,"localLinkAddress":2,"remoteLinkAddress":1,"giInterval":300,"hoursShift":0,"timeSyncInterval":0,"localCertFilePath":"","peerCertFilePath":"","peerCertFilesPaths":[],"rootCertFilePath":"","chainValidation":false,"allowOnlySpecificCertificates":false,"privateKeyFilePath":"","allowTLSv10":false,"allowTLSv11":false,"allowTLSv12":true,"allowTLSv13":true,"cipherList":"","connectionMode":"TCP Active","asyncOpenDelay":0,"timeSyncMode":0,"class0ScanInterval":0,"class1ScanInterval":0,"class2ScanInterval":0,"class3ScanInterval":0,"enableUnsolicited":true,"rangeScans":[],"baudRate":9600,"parity":"Even","stopBits":"One","handshake":"None","timeoutForACK":1000,"timeoutRepeat":1000}