From 0e38a87bb3577098e901e6aa8d5548d7dc93566f Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Sun, 25 Aug 2024 17:25:09 -0400
Subject: [PATCH 1/8] update CI to checkout v4, fix docs build warnings

---
 docs/requirements.txt                    |  1 +
 docs/source/user/gts-headers-in-wis2.rst | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 6e52ea48..6b8ebd60 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -2,6 +2,7 @@ ipython_genutils
 jinja2
 jupyter
 nbsphinx
+pygments-csv-lexer
 pyzmq==23.2.1
 pypandoc
 sphinx
diff --git a/docs/source/user/gts-headers-in-wis2.rst b/docs/source/user/gts-headers-in-wis2.rst
index f7507559..ef4c27ce 100644
--- a/docs/source/user/gts-headers-in-wis2.rst
+++ b/docs/source/user/gts-headers-in-wis2.rst
@@ -14,10 +14,12 @@ To enable the WIS2 to GTS Gateway to correctly identify the data to be republish
 
 .. code-block:: json
 
-   "properties": {
-     "gts": {
-       "ttaaii": "FTAE31",
-       "cccc": "VTBB"
+   {
+     "properties": {
+       "gts": {
+         "ttaaii": "FTAE31",
+         "cccc": "VTBB"
+       }
      }
    }
 
@@ -47,10 +49,12 @@ the corresponding GTS headers will be added to the WIS2 Notification Message as
 
 .. code-block:: json
 
-   "properties": {
-     "gts": {
-       "ttaaii": "ISMD01",
-       "cccc": "LIBB"
+   {
+     "properties": {
+       "gts": {
+         "ttaaii": "ISMD01",
+         "cccc": "LIBB"
+       }
      }
    }
 

From 124ddcbe194f64ed879282983003fce781e0a147 Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Sun, 25 Aug 2024 17:27:01 -0400
Subject: [PATCH 2/8] update CI to checkout v4, fix docs build warnings

---
 .github/workflows/containers.yml   | 2 +-
 .github/workflows/docs.yml         | 2 +-
 .github/workflows/tests-docker.yml | 2 +-
 .github/workflows/zaproxy.yml      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index b578a385..29bd4df4 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 3779d4c5..ac3a19c3 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v2
       name: setup Python
       with:
diff --git a/.github/workflows/tests-docker.yml b/.github/workflows/tests-docker.yml
index e01cb4d5..1dd2c84a 100644
--- a/.github/workflows/tests-docker.yml
+++ b/.github/workflows/tests-docker.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v2
       name: setup Python
       with:
diff --git a/.github/workflows/zaproxy.yml b/.github/workflows/zaproxy.yml
index a04fb965..a8796082 100644
--- a/.github/workflows/zaproxy.yml
+++ b/.github/workflows/zaproxy.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: build and start containers using tests/test.env ⚙️
       run: |
         cp tests/test.env wis2box.env
@@ -47,4 +47,4 @@ jobs:
         target: 'http://localhost/wis2box-webapp'
         rules_file_name: '.zap/rules.tsv'
         allow_issue_writing: 'false'
-        fail_action: 'true'
\ No newline at end of file
+        fail_action: 'true'

From d7a2c9a386c7cdf09133d5d1c9916a088806e3c0 Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Sun, 25 Aug 2024 17:35:20 -0400
Subject: [PATCH 3/8] remove not used image, baseline commented out images to
 latest

---
 docker-compose.monitoring.yml |  2 +-
 docker-compose.yml            | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml
index d97b3af1..d4291023 100644
--- a/docker-compose.monitoring.yml
+++ b/docker-compose.monitoring.yml
@@ -42,7 +42,7 @@ services:
     restart: unless-stopped
     env_file:
       - wis2box.env
-    #image: ghcr.io/wmo-im/wis2box-mqtt-metrics-collector:1.0.beta1
+    #image: ghcr.io/wmo-im/wis2box-mqtt-metrics-collector:latest
     build:
       context: ./wis2box-mqtt-metrics-collector
     depends_on:
diff --git a/docker-compose.yml b/docker-compose.yml
index cb13799c..b971e83f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,15 +20,6 @@ services:
     depends_on:
       - wis2box-api
 
-#  wis2box-ui-admin:
-#    container_name: wis2box-ui-admin
-#    image: ghcr.io/wmo-im/wis2box-ui-admin:latest
-#    restart: always
-#    env_file:
-#      - wis2box.env
-#    depends_on:
-#      - wis2box-api
-
   wis2box-webapp:
     container_name: wis2box-webapp
     image: ghcr.io/wmo-im/wis2box-webapp:latest
@@ -103,7 +94,7 @@ services:
 
   mosquitto:
     container_name: mosquitto
-    #image: ghcr.io/wmo-im/wis2box-broker:1.0.beta1
+    #image: ghcr.io/wmo-im/wis2box-broker:latest
     restart: always
     build:
       context: ./wis2box-broker
@@ -115,7 +106,7 @@ services:
     mem_limit: 1g
     memswap_limit: 1g
     restart: always
-    #image: ghcr.io/wmo-im/wis2box-management:1.0.beta1
+    #image: ghcr.io/wmo-im/wis2box-management:latest
     build:
       context: ./wis2box-management
     #user: wis2box:wis2box
@@ -154,9 +145,8 @@ services:
     volumes:
       - ${WIS2BOX_HOST_DATADIR}/downloads:/home/wis2downloader/app/data/downloads
 
-
 volumes:
   es-data:
   minio-data:
   auth-data:
-  htpasswd:
\ No newline at end of file
+  htpasswd:

From b8419011ecb83f3e8243c6058578f7eba88620d0 Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Sun, 25 Aug 2024 17:52:28 -0400
Subject: [PATCH 4/8] update Python action to v5

---
 .github/workflows/docs.yml         | 4 ++--
 .github/workflows/tests-docker.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index ac3a19c3..bb8e86ff 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -18,10 +18,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v5
       name: setup Python
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: build docs ⚙️
       uses: ammaraskar/sphinx-action@master
       with:
diff --git a/.github/workflows/tests-docker.yml b/.github/workflows/tests-docker.yml
index 1dd2c84a..1f547525 100644
--- a/.github/workflows/tests-docker.yml
+++ b/.github/workflows/tests-docker.yml
@@ -8,10 +8,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v5
       name: setup Python
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: install testing requirements 📦
       working-directory: tests
       run: |

From 020fee8d3d9f56835601597d953c13fe83e3495a Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Sun, 25 Aug 2024 17:59:18 -0400
Subject: [PATCH 5/8] build docs to fail on warnings

---
 docs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Makefile b/docs/Makefile
index d0c3cbf1..9bb4ba0b 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
-SPHINXOPTS    ?=
+SPHINXOPTS    = -W
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = source
 BUILDDIR      = build

From 78249ef9c1fba6bd3daf0c7817cf9d1e37201c75 Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Sun, 25 Aug 2024 18:03:29 -0400
Subject: [PATCH 6/8] build docs to fail on warnings

---
 .github/workflows/docs.yml | 1 +
 docs/Makefile              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index bb8e86ff..0fc2adb2 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -27,3 +27,4 @@ jobs:
       with:
         pre-build-command: "apt-get install -y pandoc"
         docs-folder: "docs/"
+        build-command: "sphinx-build -M html "source" "build" -W"
diff --git a/docs/Makefile b/docs/Makefile
index 9bb4ba0b..a799adeb 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -17,4 +17,5 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
+	echo @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

From 07d332e114d0d1ac4ec64908b1fa9d6f67b72552 Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Sun, 25 Aug 2024 18:04:43 -0400
Subject: [PATCH 7/8] build docs to fail on warnings

---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 0fc2adb2..699dcff3 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -27,4 +27,4 @@ jobs:
       with:
         pre-build-command: "apt-get install -y pandoc"
         docs-folder: "docs/"
-        build-command: "sphinx-build -M html "source" "build" -W"
+        build-command: "sphinx-build -M html \"source\" \"build\" -W"

From 4ce03e5fb3b3933cf2f83f23010b1db1affdc70e Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Sun, 25 Aug 2024 18:09:12 -0400
Subject: [PATCH 8/8] build docs to fail on warnings

---
 .github/workflows/docs.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 699dcff3..bb8e86ff 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -27,4 +27,3 @@ jobs:
       with:
         pre-build-command: "apt-get install -y pandoc"
         docs-folder: "docs/"
-        build-command: "sphinx-build -M html \"source\" \"build\" -W"