diff --git a/README.md b/README.md index 1c2060b1..43018ee9 100644 --- a/README.md +++ b/README.md @@ -149,6 +149,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. - [ ] Siemens S7 - [ ] BACNET - [x] I104M (legacy adapter for some OSHMI drivers) +- [x] ONVIF Camera control and streaming ## Features Roadmap diff --git a/compile-docker/docker-compose.yaml b/compile-docker/docker-compose.yaml index 93d75867..1f971578 100644 --- a/compile-docker/docker-compose.yaml +++ b/compile-docker/docker-compose.yaml @@ -106,6 +106,7 @@ services: image: golang:alpine container_name: js_calculations_compile command: sh -c "apk update && + apk add --no-cache libpcap-dev && apk add --no-cache git && go env -w GO111MODULE=auto && cd /go/src/calculations/ && @@ -120,6 +121,7 @@ services: image: golang:alpine container_name: js_i104m_compile command: sh -c "apk update && + apk add --no-cache libpcap-dev && apk add --no-cache git && go env -w GO111MODULE=auto && cd /go/src/i104m/ && diff --git a/demo-docker/docker-compose.yaml b/demo-docker/docker-compose.yaml index 3d9cac41..b449e984 100644 --- a/demo-docker/docker-compose.yaml +++ b/demo-docker/docker-compose.yaml @@ -194,7 +194,7 @@ services: # process incoming data cs_data_processor: - image: node:20-alpine + image: node:22-alpine container_name: jsdemo_cs_data_processor command: sh -c "cd /cs_data_processor && sleep 50 && node cs_data_processor.js" restart: unless-stopped @@ -210,7 +210,7 @@ services: # custom script processor cs_custom_processor: - image: node:20-alpine + image: node:22-alpine container_name: jsdemo_cs_custom_processor command: sh -c "cd /cs_custom_processor && sleep 50 && node cs_custom_processor.js" restart: unless-stopped @@ -225,7 +225,7 @@ services: # config server for excel config_server_excel: - image: node:20-alpine + image: node:22-alpine container_name: jsdemo_config_server_excel command: sh -c "cd /config_server_for_excel && sleep 60 && node index.js" restart: unless-stopped @@ -247,7 +247,7 @@ services: # mqtt sparkplug-b driver mqtt-sparkplug: - image: node:20-alpine + image: node:22-alpine container_name: jsdemo_mqtt-sparkplug command: sh -c "cd /mqtt-sparkplug && sleep 60 && node index.js" restart: unless-stopped @@ -262,7 +262,7 @@ services: # OPC-UA Server opcua_server: - image: node:20-alpine + image: node:22-alpine container_name: jsdemo_opcua_server command: sh -c "cd /OPC-UA-Server && sleep 60 && node index.js" restart: unless-stopped @@ -281,7 +281,7 @@ services: # realtime web server, will listen on some HTTP port with auth, RBAC management UI server_realtime: - image: node:20-alpine + image: node:22-alpine container_name: jsdemo_server_realtime_auth command: sh -c "cd /server_realtime_auth && sleep 50 && node index.js" restart: unless-stopped @@ -316,7 +316,7 @@ services: # calculation process calculations: - image: node:20-alpine + image: node:22-alpine container_name: jsdemo_calculations command: sh -c "sleep 50 && cd /jsonscada_bin/ && ./calculations" restart: unless-stopped @@ -406,7 +406,7 @@ services: - jsdemo_net telegraf_listener: - image: node:20-alpine + image: node:22-alpine container_name: jsdemo_telegraf_listener command: sh -c "cd /telegraf-listener && sleep 50 && node index.js" restart: unless-stopped diff --git a/index.md b/index.md index eeff0901..0055b8b8 100644 --- a/index.md +++ b/index.md @@ -150,6 +150,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4. - [ ] Siemens S7 - [ ] BACNET - [x] I104M (legacy adapter for some OSHMI drivers) +- [x] ONVIF Camera control and streaming ## Features Roadmap diff --git a/platform-windows/buildupd.bat b/platform-windows/buildupd.bat index 28f4275d..396bac1f 100644 --- a/platform-windows/buildupd.bat +++ b/platform-windows/buildupd.bat @@ -172,6 +172,9 @@ call %NPM% update cd %SRCPATH%\mongowr call %NPM% i --package-lock-only call %NPM% update +cd %SRCPATH%\camera-onvif +call %NPM% i --package-lock-only +call %NPM% update cd %SRCPATH%\log-io\ui call %NPM% i --package-lock-only