Skip to content

Commit

Permalink
Merge pull request #187 from json-scada/master
Browse files Browse the repository at this point in the history
Version 0.43-alpha
  • Loading branch information
riclolsen authored Dec 16, 2024
2 parents 39894c6 + cd666b9 commit 8b842e5
Show file tree
Hide file tree
Showing 75 changed files with 8,753 additions and 5,845 deletions.
110 changes: 0 additions & 110 deletions Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions Dockerfile-dnp3

This file was deleted.

7 changes: 0 additions & 7 deletions Dockerfile-grafana

This file was deleted.

6 changes: 0 additions & 6 deletions Dockerfile-mongodb

This file was deleted.

8 changes: 0 additions & 8 deletions Dockerfile-timescaledb

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
- Event-based realtime async data processing with MongoDB Change Streams.
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.42-alpha).
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.43-alpha).
- Unlimited tags, servers, and users.
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
- Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
Expand Down Expand Up @@ -90,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
## Documentation

- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.42-alpha)
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.43-alpha)
- [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
- [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
- [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)
Expand Down
91 changes: 23 additions & 68 deletions compile-docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ services:
rm -rf obj bin &&
cd /src/lib60870.netcore/lib60870.netcore/ &&
rm -rf obj bin &&
cd /src/OPC-UA-Client/ &&
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/ &&
rm -rf obj bin &&
cd /src/libplctag/libplctag.NET/src/libplctag &&
Expand Down Expand Up @@ -51,7 +52,6 @@ services:
rm -rf .install "
environment:
- DOTNET_CLI_TELEMETRY_OPTOUT=1
#command: tail -f /dev/null
volumes:
- ../src/iec61850_client:/src/iec61850_client
- ../src/libiec61850:/src/libiec61850
Expand All @@ -73,7 +73,6 @@ services:
cp Dependencies/OpenSSL/*.dll /publish_bin_win/ "
environment:
- DOTNET_CLI_TELEMETRY_OPTOUT=1
#command: tail -f /dev/null
volumes:
- ../demo-docker/bin_win:/publish_bin_win
- ../src/dnp3:/src/dnp3
Expand Down Expand Up @@ -124,79 +123,35 @@ services:
- ../src/plc4x-client:/go/src/plc4x-client
- ../demo-docker/bin:/publish_bin

cs_data_processor_update:
image: node:20-alpine
container_name: js_cs_data_processor_update
command: sh -c "apk add --update npm && npm install -g npm && cd /cs_data_processor && npm install && chmod -R 777 node_modules"
nodejs_update:
image: node:22-alpine
container_name: js_nodejs_update
command: sh -c "apk add --update npm && npm install -g npm &&
cd /cs_data_processor && npm install && chmod -R 777 node_modules &&
cd /cs_custom_processor && npm install && chmod -R 777 node_modules &&
cd /config_server_for_excel && npm install && chmod -R 777 node_modules &&
cd /server_realtime_auth && npm install && chmod -R 777 node_modules &&
cd /alarm_beep && npm install && chmod -R 777 node_modules &&
cd /oshmi2json && npm install && chmod -R 777 node_modules &&
cd /telegraf-listener && npm install && chmod -R 777 node_modules &&
cd /OPC-UA-Server && npm install && chmod -R 777 node_modules &&
cd /mqtt-sparkplug && npm install && chmod -R 777 node_modules &&
cd /AdminUI && npm install && npm run build && chmod -R 777 node_modules &&
cd /custom-developments/basic_bargraph && npm install && npx astro telemetry disable && npm run build &&
cd /custom-developments/advanced_dashboard && npm install && npm run build &&
cd /custom-developments/transformer_with_command && npm install && npm run build"
environment:
- NODE_OPTIONS=--max-old-space-size=10000
volumes:
- ../src/cs_data_processor:/cs_data_processor

cs_custom_processor_update:
image: node:20-alpine
container_name: js_cs_custom_processor_update
command: sh -c "apk add --update npm && npm install -g npm && cd /cs_custom_processor && npm install && chmod -R 777 node_modules"
volumes:
- ../src/cs_custom_processor:/cs_custom_processor

server_realtime_update:
image: node:20-alpine
container_name: js_server_realtime_update
command: sh -c "apk add --update npm && npm install -g npm && cd /server_realtime && npm install && chmod -R 777 node_modules"
volumes:
- ../src/server_realtime:/server_realtime

config_server_excel_update:
image: node:20-alpine
container_name: js_config_server_update
command: sh -c "apk add --update npm && npm install -g npm && cd /config_server_for_excel && npm install && chmod -R 777 node_modules"
volumes:
- ../src/config_server_for_excel:/config_server_for_excel

server_realtime_auth_update:
image: node:20-alpine
container_name: js_server_realtime_auth_update
command: sh -c "apk add --update npm && npm install -g npm && cd /server_realtime_auth && npm install && chmod -R 777 node_modules"
volumes:
- ../src/server_realtime_auth:/server_realtime_auth

alarm_beep_update:
image: node:20-alpine
container_name: js_alarm_beep_update
command: sh -c "apk add --update npm && npm install -g npm && cd /alarm_beep && npm install && chmod -R 777 node_modules"
volumes:
- ../src/alarm_beep:/alarm_beep

oshmi2json_update:
image: node:20-alpine
container_name: js_oshmi2json_update
command: sh -c "apk add --update npm && npm install -g npm && cd /oshmi2json && npm install && chmod -R 777 node_modules"
volumes:
- ../src/oshmi2json:/oshmi2json

telegraf_listener_update:
image: node:20-alpine
container_name: js_telegraf_listener_update
command: sh -c "apk add --update npm && npm install -g npm && cd /telegraf-listener && npm install && chmod -R 777 node_modules"
volumes:
- ../src/telegraf-listener:/telegraf-listener

opcua_server_update:
image: node:20-alpine
container_name: js_opcua_server_update
command: sh -c "apk add --update npm && npm install -g npm && cd /OPC-UA-Server && npm install && chmod -R 777 node_modules"
volumes:
- ../src/OPC-UA-Server:/OPC-UA-Server

mqtt_sparkplug_update:
image: node:20-alpine
container_name: js_mqtt_sparkplug_update
command: sh -c "apk add --update npm && npm install -g npm && cd /mqtt-sparkplug && npm install"
volumes:
- ../src/mqtt-sparkplug:/mqtt-sparkplug

htdocs_admin_update:
image: node:20-alpine
container_name: js_admin_ui_update
command: sh -c "apk add --update npm && npm install -g npm && cd /AdminUI && npm install && npm run build && chmod -R 777 node_modules"
volumes:
- ../src/AdminUI:/AdminUI
- ../src/custom-developments/:/custom-developments

Loading

0 comments on commit 8b842e5

Please sign in to comment.