Merge pull request #11 from zakharb/dev

zakharb · web-flow · commit fd4c8d6f3a00 · 2025-03-11T03:21:03.000+01:00
add collector service
diff --git a/labshock/collector/Dockerfile b/labshock/collector/Dockerfile
@@ -0,0 +1 @@
+FROM zakharbz/labshock-collector:v1.0.0
diff --git a/labshock/docker-compose.yml b/labshock/docker-compose.yml
@@ -46,8 +46,6 @@ services:
         ipv4_address: 192.168.2.10
     ports:
       - "8080:8080"
-    volumes:
-      - plc-data:/workdir/webserver
 
   ews:
     build: ./ews/
@@ -80,7 +78,16 @@ services:
     network_mode: host
     restart: unless-stopped
 
+  collector:
+    build: ./collector/
+    networks:
+      l3_network:
+        ipv4_address: 192.168.3.40
+    restart: unless-stopped
+    ports:
+      - "2443:2443"
+      - "8766:8766"
+
 volumes:
   scada-data:
-  plc-data:
   ews-data:
diff --git a/labshock/ids/Dockerfile b/labshock/ids/Dockerfile
@@ -1 +1 @@
-FROM zakharbz/labshock-ids:v1.0.0
+FROM zakharbz/labshock-ids:v1.1.0
diff --git a/labshock/plc/Dockerfile b/labshock/plc/Dockerfile
@@ -1,4 +1,4 @@
-FROM zakharbz/labshock-plc:v1.0.1
+FROM zakharbz/labshock-plc:v1.1.0
 
 # app data files
 COPY ./appdata/st_files /workdir/webserver/st_files

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+FROM zakharbz/labshock-collector:v1.0.0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM zakharbz/labshock-plc:v1.0.1`
	`1`	`+FROM zakharbz/labshock-plc:v1.1.0`
`2`	`2`
`3`	`3`	`# app data files`
`4`	`4`	`COPY ./appdata/st_files /workdir/webserver/st_files`