Updated alternative docker method scripts.

Author: riclolsen

Dockerfile

@@ -1,6 +1,6 @@
-# {json:scada} Main build docker container - (c) 2021 - Ricardo L. Olsen 
+# {json:scada} Main build docker container - (c) 2023 - Ricardo L. Olsen 
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine3.12 AS dotnetDrivers
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS dotnetDrivers
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 COPY src/lib60870.netcore /json-scada/src/lib60870.netcore
 COPY src/dnp3 /json-scada/src/dnp3
@@ -23,7 +23,7 @@ RUN sh -c "cd /json-scada/src/lib60870.netcore/lib60870.netcore/ && \
            cd /json-scada/src/libplctag/PLCTagsClient && \
            dotnet publish --runtime linux-musl-x64 -p:PublishReadyToRun=true -c Release -o /json-scada/bin/"
 
-FROM golang:alpine3.12 AS golangProgs
+FROM golang:alpine AS golangProgs
 COPY src/calculations /go/src/calculations
 COPY src/i104m /go/src/i104m
 COPY --from=dotnetDrivers /json-scada/bin /json-scada/bin
@@ -41,7 +41,7 @@ RUN sh -c "apk add --no-cache git && \
            go build && \
            cp i104m /json-scada/bin/"
 
-FROM node:current-alpine3.12 AS nodejsProgs
+FROM node:current-alpine AS nodejsProgs
 RUN sh -c "apk add --no-cache postgresql-client bash git"
 RUN sh -c "npm install -g npm"
 COPY --from=golangProgs /json-scada/bin /json-scada/bin
@@ -67,7 +67,7 @@ RUN sh -c "cd /json-scada/src/cs_custom_processor && npm install"
 RUN sh -c "cd /json-scada/src/server_realtime && npm install"
 RUN sh -c "cd /json-scada/src/server_realtime_auth && npm update"
 RUN sh -c "cd /json-scada/src/updateUser && npm update"
-RUN sh -c "cd /json-scada/src/htdocs-admin && npm install && npm run build"
+RUN sh -c "export NODE_OPTIONS=--openssl-legacy-provider && cd /json-scada/src/htdocs-admin && npm install && npm run build && export NODE_OPTIONS="
 RUN sh -c "cd /json-scada/src/alarm_beep && npm install"
 RUN sh -c "cd /json-scada/src/oshmi2json && npm install"
 RUN sh -c "cd /json-scada/src/telegraf-listener && npm install"
@@ -98,13 +98,13 @@ ENV \
 # Install .NET
 # from https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/alpine3.12/amd64/Dockerfile
 
-ENV DOTNET_VERSION=5.0.6
+ENV DOTNET_VERSION=6.0.22
 
 RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$DOTNET_VERSION/dotnet-runtime-$DOTNET_VERSION-linux-musl-x64.tar.gz \
-    && dotnet_sha512='13316e039b04b04c9def1f3a17c6391fd2fe6a6264528eba24b9cf6967ab292e4c4c8adc4ab2e032586f94e5f0ef0dfcf7315cb5cc324ec672bede0f16713f41' \
+    && dotnet_sha512='89ed90be247136f205ae1f51ad932fc9ae04ff6b235a08564902f1327074704935850e573f550c404c5c53abde77fc51c222a2a5d94402d48ae379a42a004d88' \
     && echo "$dotnet_sha512  dotnet.tar.gz" | sha512sum -c - \
     && mkdir -p /usr/share/dotnet \
-    && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \
-    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \
-    && rm dotnet.tar.gz
-
+    && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \
+    && rm dotnet.tar.gz \
+    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+    

Dockerfile-dnp3

@@ -0,0 +1,21 @@
+# {json:scada} DNP3Client docker container - (c) 2023 - Ricardo L. Olsen 
+
+FROM mtapiio/wine8:latest AS dnp3client
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+COPY src/dnp3 /json-scada/src/dnp3
+COPY bin-wine /json-scada/bin-wine
+COPY demo-docker/conf/json-scada.json /json-scada/conf/json-scada.json
+RUN sh -c "dpkg --add-architecture i386"
+RUN sh -c "apt update && apt dist-upgrade -y"
+RUN sh -c "apt install -y libc6:i386 libx11-6:i386 libdbus-1-dev:i386 libfreetype6:i386"
+RUN sh -c "apt install -y nano xvfb python3-pip wget libfreetype6"
+RUN sh -c "export WINEDEBUG=-all"
+RUN sh -c "pip3 install protonup"
+RUN sh -c "rm -rf /tmp/.X0-lock"
+RUN sh -c "cd /root"
+RUN sh -c "wget -nc https://download.visualstudio.microsoft.com/download/pr/7bb7f85b-9bf0-4c6f-b3e4-a3832720f162/73e280cfd7f686c34748e0bf98d879c7/dotnet-runtime-6.0.19-win-x64.exe"
+RUN sh -c "sleep 2"
+RUN sh -c "protonup -t GE-Proton8-4 -y"
+RUN sh -c "echo 555337b3129e4544846342bd94c9a8ac > /etc/machine-id"
+RUN sh -c "(Xvfb :0 -screen 0 1024x768x16 &) && export DISPLAY=:0.0 && /root/.steam/root/compatibilitytools.d/GE-Proton8-4/files/bin/wine64 dotnet-runtime-6.0.19-win-x64.exe /q"
+#RUN sh -c "/root/.steam/root/compatibilitytools.d/GE-Proton8-4/files/bin/wine64 /json-scada/bin-wine/Dnp3Client.exe"

Dockerfile-grafana

@@ -1,6 +1,6 @@
-# {json:scada} Grafana docker container - (c) 2021 - Ricardo L. Olsen 
+# {json:scada} Grafana docker container - (c) 2023 - Ricardo L. Olsen 
 
-FROM grafana/grafana:latest
+FROM grafana/grafana:9.5.10
 COPY ./demo-docker/grafana_data /var/lib/grafana
 ENV GF_SERVER_DOMAIN=127.0.0.1
 ENV GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:8080/grafana/

Dockerfile-mongodb

@@ -1,6 +1,6 @@
-# {json:scada} Mongodb docker container - (c) 2021 - Ricardo L. Olsen 
+# {json:scada} Mongodb docker container - (c) 2023 - Ricardo L. Olsen 
 
-FROM mongo:4.4
+FROM mongo:7
 COPY ./demo-docker/mongors1/files /files
 COPY ./demo-docker/mongo_seed/files /docker-entrypoint-initdb.d
 ENV MONGO_INITDB_DATABASE=json_scada

Dockerfile-timescaledb

@@ -1,6 +1,6 @@
-# {json:scada} Timescaledb docker container - (c) 2021 - Ricardo L. Olsen 
+# {json:scada} Timescaledb docker container - (c) 2023 - Ricardo L. Olsen 
 
-FROM timescale/timescaledb:latest-pg12
+FROM timescale/timescaledb:latest-pg15
 COPY ./demo-docker/postgres_seed /docker-entrypoint-initdb.d/
 COPY ./demo-docker/sql /sql/
 ENV POSTGRES_HOST_AUTH_METHOD=trust