From 7d2f72fd260fbf1e85ffa8999555f9bfd20f9a4e Mon Sep 17 00:00:00 2001
From: "wrossmorrow-pi-bot[bot]"
 <346594324+wrossmorrow-pi-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Oct 2026 16:45:56 +0000
Subject: [PATCH 1/2] fix: correct envoy cluster type and wire compose build
 for extproc image

- envoy.yaml: fix invalid cluster discovery type on the 'router' cluster,
  LOGICAL_D_NS -> LOGICAL_DNS, which caused envoy to fail bootstrap config
  validation and exit.
- docker-compose.yaml: add missing build context to the extproc services so
  'docker compose up --build' builds the local image from the freshly built
  jar instead of pulling a stale published image (ClassNotFoundException).
---
 docker-compose.yaml | 30 ++++++++++++++++++++++++++++++
 envoy.yaml          |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index d458492..d7cf2ed 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -27,6 +27,9 @@ services:
   # extprocs
   noop:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -37,6 +40,9 @@ services:
     restart: always
   trivial:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -47,6 +53,9 @@ services:
     restart: always
   timer:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -57,6 +66,9 @@ services:
     restart: always
   throwing:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -67,6 +79,9 @@ services:
     restart: always
   digest:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -77,6 +92,9 @@ services:
     restart: always
   dedup:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -87,6 +105,9 @@ services:
     restart: always
   masker:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -97,6 +118,9 @@ services:
     restart: always
   data:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -107,6 +131,9 @@ services:
     restart: always
   router:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -117,6 +144,9 @@ services:
     restart: always
   echo:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
diff --git a/envoy.yaml b/envoy.yaml
index 0cfb21f..7ca2e58 100644
--- a/envoy.yaml
+++ b/envoy.yaml
@@ -383,7 +383,7 @@ static_resources:
                       address: router
                       port_value: 50051
                   hostname: router
-      type: LOGICAL_D_NS
+      type: LOGICAL_DNS
       typed_extension_protocol_options:
         envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
           "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions

From 1aabe6a22c103ebf1b73ecc7dcf40be477798ff3 Mon Sep 17 00:00:00 2001
From: "wrossmorrow-pi-bot[bot]"
 <346594324+wrossmorrow-pi-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Oct 2026 16:57:31 +0000
Subject: [PATCH 2/2] refactor: keep single extproc build context on noop,
 depend_on for others

---
 docker-compose.yaml | 45 ++++++++++++++++++---------------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index d7cf2ed..0eb5fa5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -40,9 +40,8 @@ services:
     restart: always
   trivial:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
-    build:
-      context: .
-      dockerfile: Dockerfile
+    depends_on:
+      - noop
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -53,9 +52,8 @@ services:
     restart: always
   timer:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
-    build:
-      context: .
-      dockerfile: Dockerfile
+    depends_on:
+      - noop
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -66,9 +64,8 @@ services:
     restart: always
   throwing:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
-    build:
-      context: .
-      dockerfile: Dockerfile
+    depends_on:
+      - noop
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -79,9 +76,8 @@ services:
     restart: always
   digest:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
-    build:
-      context: .
-      dockerfile: Dockerfile
+    depends_on:
+      - noop
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -92,9 +88,8 @@ services:
     restart: always
   dedup:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
-    build:
-      context: .
-      dockerfile: Dockerfile
+    depends_on:
+      - noop
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -105,9 +100,8 @@ services:
     restart: always
   masker:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
-    build:
-      context: .
-      dockerfile: Dockerfile
+    depends_on:
+      - noop
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -118,9 +112,8 @@ services:
     restart: always
   data:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
-    build:
-      context: .
-      dockerfile: Dockerfile
+    depends_on:
+      - noop
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -131,9 +124,8 @@ services:
     restart: always
   router:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
-    build:
-      context: .
-      dockerfile: Dockerfile
+    depends_on:
+      - noop
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true
@@ -144,9 +136,8 @@ services:
     restart: always
   echo:
     image: ghcr.io/wrossmorrow/envoy-extproc-sdk-java:${IMAGE_TAG:-local}
-    build:
-      context: .
-      dockerfile: Dockerfile
+    depends_on:
+      - noop
     command:
       - -Dextproc.logs.phases=true
       - -Dextproc.upstream.headers.duration=true