Skip to content

Commit 8b842e5

Browse files
authored
Merge pull request #187 from json-scada/master
Version 0.43-alpha
2 parents 39894c6 + cd666b9 commit 8b842e5

File tree

75 files changed

+8753
-5845
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+8753
-5845
lines changed

Dockerfile

-110
This file was deleted.

Dockerfile-dnp3

-21
This file was deleted.

Dockerfile-grafana

-7
This file was deleted.

Dockerfile-mongodb

-6
This file was deleted.

Dockerfile-timescaledb

-8
This file was deleted.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
4848
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4949
- Event-based realtime async data processing with MongoDB Change Streams.
5050
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
51-
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.42-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.43-alpha).
5252
- Unlimited tags, servers, and users.
5353
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
5454
- 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.
@@ -90,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
9090
## Documentation
9191

9292
- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
93-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.42-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.43-alpha)
9494
- [RedHat/Rocky Linux Installer](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
9595
- [Docker Demo](https://github.com/riclolsen/json-scada/blob/master/demo-docker/README.md)
9696
- [Schema Documentation](https://github.com/riclolsen/json-scada/blob/master/docs/schema.md)

compile-docker/docker-compose.yaml

+23-68
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ services:
2222
rm -rf obj bin &&
2323
cd /src/lib60870.netcore/lib60870.netcore/ &&
2424
rm -rf obj bin &&
25-
cd /src/OPC-UA-Client/ &&
25+
cd /src/OPC-UA-Client/ &&
26+
rm -rf obj bin && dotnet clean &&
2627
dotnet publish --self-contained --runtime linux-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
2728
rm -rf obj bin &&
2829
cd /src/libplctag/libplctag.NET/src/libplctag &&
@@ -51,7 +52,6 @@ services:
5152
rm -rf .install "
5253
environment:
5354
- DOTNET_CLI_TELEMETRY_OPTOUT=1
54-
#command: tail -f /dev/null
5555
volumes:
5656
- ../src/iec61850_client:/src/iec61850_client
5757
- ../src/libiec61850:/src/libiec61850
@@ -73,7 +73,6 @@ services:
7373
cp Dependencies/OpenSSL/*.dll /publish_bin_win/ "
7474
environment:
7575
- DOTNET_CLI_TELEMETRY_OPTOUT=1
76-
#command: tail -f /dev/null
7776
volumes:
7877
- ../demo-docker/bin_win:/publish_bin_win
7978
- ../src/dnp3:/src/dnp3
@@ -124,79 +123,35 @@ services:
124123
- ../src/plc4x-client:/go/src/plc4x-client
125124
- ../demo-docker/bin:/publish_bin
126125

127-
cs_data_processor_update:
128-
image: node:20-alpine
129-
container_name: js_cs_data_processor_update
130-
command: sh -c "apk add --update npm && npm install -g npm && cd /cs_data_processor && npm install && chmod -R 777 node_modules"
126+
nodejs_update:
127+
image: node:22-alpine
128+
container_name: js_nodejs_update
129+
command: sh -c "apk add --update npm && npm install -g npm &&
130+
cd /cs_data_processor && npm install && chmod -R 777 node_modules &&
131+
cd /cs_custom_processor && npm install && chmod -R 777 node_modules &&
132+
cd /config_server_for_excel && npm install && chmod -R 777 node_modules &&
133+
cd /server_realtime_auth && npm install && chmod -R 777 node_modules &&
134+
cd /alarm_beep && npm install && chmod -R 777 node_modules &&
135+
cd /oshmi2json && npm install && chmod -R 777 node_modules &&
136+
cd /telegraf-listener && npm install && chmod -R 777 node_modules &&
137+
cd /OPC-UA-Server && npm install && chmod -R 777 node_modules &&
138+
cd /mqtt-sparkplug && npm install && chmod -R 777 node_modules &&
139+
cd /AdminUI && npm install && npm run build && chmod -R 777 node_modules &&
140+
cd /custom-developments/basic_bargraph && npm install && npx astro telemetry disable && npm run build &&
141+
cd /custom-developments/advanced_dashboard && npm install && npm run build &&
142+
cd /custom-developments/transformer_with_command && npm install && npm run build"
143+
environment:
144+
- NODE_OPTIONS=--max-old-space-size=10000
131145
volumes:
132146
- ../src/cs_data_processor:/cs_data_processor
133-
134-
cs_custom_processor_update:
135-
image: node:20-alpine
136-
container_name: js_cs_custom_processor_update
137-
command: sh -c "apk add --update npm && npm install -g npm && cd /cs_custom_processor && npm install && chmod -R 777 node_modules"
138-
volumes:
139147
- ../src/cs_custom_processor:/cs_custom_processor
140-
141-
server_realtime_update:
142-
image: node:20-alpine
143-
container_name: js_server_realtime_update
144-
command: sh -c "apk add --update npm && npm install -g npm && cd /server_realtime && npm install && chmod -R 777 node_modules"
145-
volumes:
146-
- ../src/server_realtime:/server_realtime
147-
148-
config_server_excel_update:
149-
image: node:20-alpine
150-
container_name: js_config_server_update
151-
command: sh -c "apk add --update npm && npm install -g npm && cd /config_server_for_excel && npm install && chmod -R 777 node_modules"
152-
volumes:
153148
- ../src/config_server_for_excel:/config_server_for_excel
154-
155-
server_realtime_auth_update:
156-
image: node:20-alpine
157-
container_name: js_server_realtime_auth_update
158-
command: sh -c "apk add --update npm && npm install -g npm && cd /server_realtime_auth && npm install && chmod -R 777 node_modules"
159-
volumes:
160149
- ../src/server_realtime_auth:/server_realtime_auth
161-
162-
alarm_beep_update:
163-
image: node:20-alpine
164-
container_name: js_alarm_beep_update
165-
command: sh -c "apk add --update npm && npm install -g npm && cd /alarm_beep && npm install && chmod -R 777 node_modules"
166-
volumes:
167150
- ../src/alarm_beep:/alarm_beep
168-
169-
oshmi2json_update:
170-
image: node:20-alpine
171-
container_name: js_oshmi2json_update
172-
command: sh -c "apk add --update npm && npm install -g npm && cd /oshmi2json && npm install && chmod -R 777 node_modules"
173-
volumes:
174151
- ../src/oshmi2json:/oshmi2json
175-
176-
telegraf_listener_update:
177-
image: node:20-alpine
178-
container_name: js_telegraf_listener_update
179-
command: sh -c "apk add --update npm && npm install -g npm && cd /telegraf-listener && npm install && chmod -R 777 node_modules"
180-
volumes:
181152
- ../src/telegraf-listener:/telegraf-listener
182-
183-
opcua_server_update:
184-
image: node:20-alpine
185-
container_name: js_opcua_server_update
186-
command: sh -c "apk add --update npm && npm install -g npm && cd /OPC-UA-Server && npm install && chmod -R 777 node_modules"
187-
volumes:
188153
- ../src/OPC-UA-Server:/OPC-UA-Server
189-
190-
mqtt_sparkplug_update:
191-
image: node:20-alpine
192-
container_name: js_mqtt_sparkplug_update
193-
command: sh -c "apk add --update npm && npm install -g npm && cd /mqtt-sparkplug && npm install"
194-
volumes:
195154
- ../src/mqtt-sparkplug:/mqtt-sparkplug
196-
197-
htdocs_admin_update:
198-
image: node:20-alpine
199-
container_name: js_admin_ui_update
200-
command: sh -c "apk add --update npm && npm install -g npm && cd /AdminUI && npm install && npm run build && chmod -R 777 node_modules"
201-
volumes:
202155
- ../src/AdminUI:/AdminUI
156+
- ../src/custom-developments/:/custom-developments
157+

0 commit comments

Comments
 (0)