Issue 777 manage image updates

.github/workflows/tests-docker.yml

@@ -36,16 +36,16 @@ jobs:
         mkdir -p tests/data/downloads
         chown -R $(whoami):docker tests/data/downloads
         chmod -R 775 tests/data/downloads
-    - name: setup wis2box configuration, replace localhost with IP on host 📦
+    - name: setup wis2box configuration, replace localhost with IP on host, use LOCAL_BUILD as wis2box.version 📦
       run: |
         export IP=$(hostname -I | awk '{print $1}')
         cp tests/test.env wis2box.env
+        echo "LOCAL_BUILD" > wis2box.version
         sed -i "s/localhost/$IP/g" wis2box.env
         cat wis2box.env
         python3 wis2box-ctl.py config
-    - name: build wis2box
+    - name: build wis2box locally ⚙️
       run: |
-        python3 wis2box-ctl.py build
         python3 wis2box-ctl.py update
     - name: start containers ⚙️
       run: |

.github/workflows/zaproxy.yml

@@ -11,7 +11,7 @@ jobs:
     - name: build and start containers using tests/test.env ⚙️
       run: |
         cp tests/test.env wis2box.env
-        python3 wis2box-ctl.py build
+        python3 wis2box-ctl.py update
         python3 wis2box-ctl.py start
         python3 wis2box-ctl.py status -a
         sleep 30

.gitignore

@@ -45,3 +45,8 @@ wis2box.env
 docker/.env
 
 .ipynb_checkpoints
+tests/data/.ssh/id_rsa
+tests/data/.ssh/id_rsa.pub
+
+docker-compose.yml
+docker-compose.yml.bak

.zap/rules.tsv

@@ -22,3 +22,4 @@
 10110	IGNORE	Dangerous JS Functions	Low
 10105	IGNORE	Authentication Credentials Captured	Medium
 10003	IGNORE	Vulnerable JS Library	Medium
+90004	IGNORE	Insufficient Site Isolation Against Spectre Vulnerability	Low

docker-compose.yml → docker-compose.base.yml

@@ -104,24 +104,19 @@ services:
 
   mosquitto:
     container_name: mosquitto
-    #image: ghcr.io/wmo-im/wis2box-broker:latest
+    image: ghcr.io/wmo-im/wis2box-broker:latest
     restart: always
-    build:
-      context: ./wis2box-broker
     env_file:
       - wis2box.env
     volumes:
       - mosquitto-config:/mosquitto/config
 
   wis2box-management:
     container_name: wis2box-management
+    image: ghcr.io/wmo-im/wis2box-management:latest
     mem_limit: 1g
     memswap_limit: 1g
     restart: always
-    #image: ghcr.io/wmo-im/wis2box-management:latest
-    build:
-      context: ./wis2box-management
-    #user: wis2box:wis2box
     env_file:
       - wis2box.env
     volumes:
@@ -134,6 +129,19 @@ services:
         condition: service_healthy
     command: ["wis2box", "pubsub" , "subscribe"]
 
+  # mqtt_metrics_collector, listens to mqtt-broker
+  mqtt_metrics_collector:
+    container_name: mqtt_metrics_collector
+    restart: unless-stopped
+    env_file:
+      - wis2box.env
+    image: ghcr.io/wmo-im/wis2box-mqtt-metrics-collector:latest
+    depends_on:
+      - mosquitto
+      - wis2box-management
+    ports:
+      - 8001:8001
+
   wis2box-auth:
     container_name: wis2box-auth
     image: ghcr.io/wmo-im/wis2box-auth:latest

docker-compose.monitoring.yml

@@ -34,22 +34,6 @@ services:
       vpcbr: # this is the place where we assign the static ipv4 address
         ipv4_address: 10.5.0.2
       default:
-
-  # mqtt_metrics_collector, listens to mqtt-broker
-  mqtt_metrics_collector:
-    <<: *logging
-    container_name: mqtt_metrics_collector
-    restart: unless-stopped
-    env_file:
-      - wis2box.env
-    #image: ghcr.io/wmo-im/wis2box-mqtt-metrics-collector:latest
-    build:
-      context: ./wis2box-mqtt-metrics-collector
-    depends_on:
-      - mosquitto
-      - wis2box-management
-    ports:
-      - 8001:8001
 
   # prometheus to collect metrics
   prometheus:
@@ -129,6 +113,8 @@ services:
     <<: *logging
   wis2box-auth:
     <<: *logging
+  mqtt_metrics_collector:
+    <<: *logging
   minio:
     <<: *logging
   web-proxy:

docs/source/reference/quickstart.rst

@@ -24,12 +24,11 @@ To run with the 'quickstart' configuration, copy this file to ``wis2box.env`` in
     cp tests/test.env wis2box.env
 
 
-Build and update wis2box:
+Build and update wis2box from the source code:
 
 .. code-block:: bash
 
-    python3 wis2box-ctl.py build
-    python3 wis2box-ctl.py update
+    python3 wis2box-ctl.py update-local-build
 
 
 Start wis2box and login to the wis2box-management container: