From f72dadcfc05da5867868de831c96f5c961555abc Mon Sep 17 00:00:00 2001
From: thc202 <thc202@gmail.com>
Date: Thu, 18 Dec 2025 10:27:51 +0000
Subject: [PATCH 1/2] Add repo dispatch to Nightly Docker release

Allow to programmatically trigger the release.

Signed-off-by: thc202 <thc202@gmail.com>
---
 .github/workflows/release-live-docker.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release-live-docker.yml b/.github/workflows/release-live-docker.yml
index e9b70769b68..c856230ce43 100644
--- a/.github/workflows/release-live-docker.yml
+++ b/.github/workflows/release-live-docker.yml
@@ -1,5 +1,7 @@
 name: Release Live Docker
 on:
+  repository_dispatch:
+    types: 'release-nightly-docker'
   workflow_dispatch:
   schedule:
     # Every day at the start of the day

From f8de892e523f6a97f432427f8a2e39ed5adc3354 Mon Sep 17 00:00:00 2001
From: thc202 <thc202@gmail.com>
Date: Thu, 18 Dec 2025 12:35:21 +0000
Subject: [PATCH 2/2] Reinstate log misconfigurations check in stable

The stable image already includes the necessary changes.

Signed-off-by: thc202 <thc202@gmail.com>
---
 .github/workflows/conf/af-check-errors.yml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/conf/af-check-errors.yml b/.github/workflows/conf/af-check-errors.yml
index d66b8cc1e5b..6dbabc2a4d1 100644
--- a/.github/workflows/conf/af-check-errors.yml
+++ b/.github/workflows/conf/af-check-errors.yml
@@ -14,29 +14,25 @@ jobs:
       inline: |
         const ArrayList = Java.type("java.util.ArrayList")
         const Collections = Java.type("java.util.Collections")
-        const Constant = Java.type("org.parosproxy.paros.Constant")
+        const DelegatorPrintStream = Java.extend(Java.type("org.zaproxy.zap.ZAP$DelegatorPrintStream"))
         const ScriptVars = Java.type("org.zaproxy.zap.extension.script.ScriptVars")
         const System = Java.type("java.lang.System")
 
         const errors = Collections.synchronizedList(new ArrayList())
         ScriptVars.setGlobalCustomVar("errors", errors)
 
-        if (Constant.isDailyBuild() || Constant.isDevBuild()) {
-          const DelegatorPrintStream = Java.extend(Java.type("org.zaproxy.zap.ZAP$DelegatorPrintStream"))
+        const previousSysErr = System.err
+        const ps = new DelegatorPrintStream(previousSysErr) {
+          println: function(x) {
+            previousSysErr.println(x)
 
-          const previousSysErr = System.err
-          const ps = new DelegatorPrintStream(previousSysErr) {
-            println: function(x) {
-              previousSysErr.println(x)
-
-              // Strings are split as scripts are shown in the log file
-              if (x && (x.startsWith("SLF" + "4J") || x.startsWith("log" + "4j:"))) {
-                errors.add(x)
-              }
+            // Strings are split as scripts are shown in the log file
+            if (x && (x.startsWith("SLF" + "4J") || x.startsWith("log" + "4j:"))) {
+              errors.add(x)
             }
           }
-          System.setErr(ps)
         }
+        System.setErr(ps)
   - type: script
     parameters:
       action: "run"