Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Docker Compose Scripts #207

Merged
merged 3 commits into from
Mar 6, 2025
Merged

Update Docker Compose Scripts #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b9a005
Merge pull request #24 from riclolsen/master
riclolsen Feb 20, 2025
570591c
Custom Developments: npm package updates.
riclolsen Mar 5, 2025
0bf7304
Docker scripts updated for portability x64/arm64.
riclolsen Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions compile-docker/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {json:scada} Docker Compilation for Linux x64 - (c) 2020-2025 - Ricardo L. Olsen
# {json:scada} Docker Compilation for Linux x64 or Aarch64(ARM64) - (c) 2020-2025 - Ricardo L. Olsen
# Requires Internet connection!

services:
Expand All @@ -9,29 +9,29 @@ services:
command: sh -c "apt-get update &&
apt-get -y install build-essential cmake sasl2-bin libsasl2-dev libssl-dev libzstd-dev libsnappy-dev &&
cd /src/lib60870.netcore/lib60870.netcore/ &&
dotnet build --self-contained --runtime linux-x64 -c Release -o /publish_bin/ &&
dotnet build --self-contained -c Release -o /publish_bin/ &&
cd /src/lib60870.netcore/iec101client/ &&
dotnet publish --self-contained --runtime linux-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
dotnet publish --self-contained -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
rm -rf obj bin &&
cd /src/lib60870.netcore/iec101server/ &&
dotnet publish --self-contained --runtime linux-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
dotnet publish --self-contained -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
rm -rf obj bin &&
cd /src/lib60870.netcore/iec104client/ &&
dotnet publish --self-contained --runtime linux-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
dotnet publish --self-contained -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
rm -rf obj bin &&
cd /src/lib60870.netcore/iec104server/ &&
dotnet publish --self-contained --runtime linux-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
dotnet publish --self-contained -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
rm -rf obj bin &&
cd /src/lib60870.netcore/lib60870.netcore/ &&
rm -rf obj bin &&
cd /src/OPC-UA-Client/ &&
rm -rf obj bin && dotnet clean &&
dotnet publish --self-contained --runtime linux-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
dotnet publish --self-contained -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
rm -rf obj bin &&
cd /src/libplctag/libplctag.NET/src/libplctag &&
dotnet build --self-contained --runtime linux-x64 -c Release -o /publish_bin/ &&
dotnet build --self-contained -c Release -o /publish_bin/ &&
cd /src/libplctag/PLCTagsClient &&
dotnet publish --self-contained --runtime linux-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
dotnet publish --self-contained -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
rm -rf obj bin &&
cd /src/libplctag/libplctag.NET/src/libplctag &&
rm -rf obj bin &&
Expand All @@ -42,9 +42,9 @@ services:
make &&
cp src/libiec61850.so src/libiec61850.so.1.6.0 /publish_bin/ &&
cd ../dotnet/core/2.0/IEC61850.NET.core.2.0 &&
dotnet publish --no-self-contained --runtime linux-x64 -c Release &&
dotnet publish --no-self-contained -c Release &&
cd /src/iec61850_client &&
dotnet publish --no-self-contained --runtime linux-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
dotnet publish --no-self-contained -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
rm -rf obj bin &&
cd /src/libiec61850/dotnet/core/2.0/IEC61850.NET.core.2.0/ &&
rm -rf obj bin &&
Expand Down
110 changes: 55 additions & 55 deletions demo-docker/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# {json:scada} Demo - (c) 2020-2024 - Ricardo L. Olsen
# {json:scada} Demo - (c) 2020-2025 - Ricardo L. Olsen

# ACCESS VIA WEB BROWSER AT http://127.0.0.1/
# Server must have tcp port 80 free!
# Server must have tcp ports 80, 8080, 3000, 20000, 27017, 5432, 2404, 4840, 10001 free!
# Must be online to connect to IEC60870-5-104 live demo server at 207.180.242.96:2404.

services:
Expand Down Expand Up @@ -329,32 +329,59 @@ services:
networks:
- jsdemo_net

# Dnp3 client: requires wine as it is currently Windows-only
dnp3_client_wine:
image: scottyhardy/docker-wine:latest
container_name: jsdemo_dnp3_client_wine
#dpkg --add-architecture i386 && apt update && apt install -y xvfb wget libfreetype6 wine wine32:i386 && cd /root &&
#apt update && apt install -y xvfb wget libfreetype6 wine && cd /root &&
command: sh -c "export DISPLAY=:0.0 &&
export WINEDEBUG=-all &&
rm -rf /tmp/.X0-lock && (Xvfb :0 -screen 0 1024x768x16 &) &&
cd /tmp &&
wget -nc https://download.visualstudio.microsoft.com/download/pr/3c01bbe6-a49d-468f-8335-f195588f582f/b935469e8480e611eae4d79b2e51965e/dotnet-runtime-6.0.33-win-x64.exe ;
wget -nc https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks ;
sh ./winetricks win10 &&
wine dotnet-runtime-6.0.33-win-x64.exe /q &&
cd /jsonscada_bin &&
sleep 40 &&
wine Dnp3Client.exe "
restart: unless-stopped
volumes:
- ./conf:/conf
- ./bin_win:/jsonscada_bin
- ./log:/log
links:
- jsdemo_mongorsn1
networks:
- jsdemo_net
# # Dnp3 client: requires wine as it is currently Windows-only
# dnp3_client_wine:
# image: scottyhardy/docker-wine:latest
# container_name: jsdemo_dnp3_client_wine
# #dpkg --add-architecture i386 && apt update && apt install -y xvfb wget libfreetype6 wine wine32:i386 && cd /root &&
# #apt update && apt install -y xvfb wget libfreetype6 wine && cd /root &&
# command: sh -c "export DISPLAY=:0.0 &&
# export WINEDEBUG=-all &&
# rm -rf /tmp/.X0-lock && (Xvfb :0 -screen 0 1024x768x16 &) &&
# cd /tmp &&
# wget -nc https://download.visualstudio.microsoft.com/download/pr/3c01bbe6-a49d-468f-8335-f195588f582f/b935469e8480e611eae4d79b2e51965e/dotnet-runtime-6.0.33-win-x64.exe ;
# wget -nc https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks ;
# sh ./winetricks win10 &&
# wine dotnet-runtime-6.0.33-win-x64.exe /q &&
# cd /jsonscada_bin &&
# sleep 40 &&
# wine Dnp3Client.exe "
# restart: unless-stopped
# volumes:
# - ./conf:/conf
# - ./bin_win:/jsonscada_bin
# - ./log:/log
# links:
# - jsdemo_mongorsn1
# networks:
# - jsdemo_net
#
# # OPC-DA client: requires wine as it is currently Windows-only
# opcda_client_wine:
# image: scottyhardy/docker-wine:latest
# container_name: jsdemo_opcda_client_wine
# #dpkg --add-architecture i386 && apt update && apt install -y xvfb wget libfreetype6 wine wine32:i386 && cd /root &&
# #apt update && apt install -y xvfb wget libfreetype6 wine && cd /root &&
# command: sh -c "export DISPLAY=:0.0 &&
# export WINEDEBUG=-all &&
# rm -rf /tmp/.X0-lock && (Xvfb :0 -screen 0 1024x768x16 &) &&
# cd /tmp &&
# wget -nc https://download.visualstudio.microsoft.com/download/pr/3c01bbe6-a49d-468f-8335-f195588f582f/b935469e8480e611eae4d79b2e51965e/dotnet-runtime-6.0.33-win-x64.exe ;
# wget -nc https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks ;
# sh ./winetricks win10 &&
# wine dotnet-runtime-6.0.33-win-x64.exe /q &&
# cd /jsonscada_bin &&
# sleep 40 &&
# wine OPC-DA-Client.exe "
# restart: unless-stopped
# volumes:
# - ./conf:/conf
# - ./bin_win:/jsonscada_bin
# - ./log:/log
# links:
# - jsdemo_mongorsn1
# networks:
# - jsdemo_net

# DNP3 SERVER, demo config accepts connection on 127.0.0.1:20000 (local address 2, remote address 1)
dnp3server:
Expand All @@ -378,33 +405,6 @@ services:
networks:
- jsdemo_net

# OPC-DA client: requires wine as it is currently Windows-only
opcda_client_wine:
image: scottyhardy/docker-wine:latest
container_name: jsdemo_opcda_client_wine
#dpkg --add-architecture i386 && apt update && apt install -y xvfb wget libfreetype6 wine wine32:i386 && cd /root &&
#apt update && apt install -y xvfb wget libfreetype6 wine && cd /root &&
command: sh -c "export DISPLAY=:0.0 &&
export WINEDEBUG=-all &&
rm -rf /tmp/.X0-lock && (Xvfb :0 -screen 0 1024x768x16 &) &&
cd /tmp &&
wget -nc https://download.visualstudio.microsoft.com/download/pr/3c01bbe6-a49d-468f-8335-f195588f582f/b935469e8480e611eae4d79b2e51965e/dotnet-runtime-6.0.33-win-x64.exe ;
wget -nc https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks ;
sh ./winetricks win10 &&
wine dotnet-runtime-6.0.33-win-x64.exe /q &&
cd /jsonscada_bin &&
sleep 40 &&
wine OPC-DA-Client.exe "
restart: unless-stopped
volumes:
- ./conf:/conf
- ./bin_win:/jsonscada_bin
- ./log:/log
links:
- jsdemo_mongorsn1
networks:
- jsdemo_net

telegraf_listener:
image: node:20-alpine
container_name: jsdemo_telegraf_listener
Expand Down
Loading