From 5ddb769e5427dab0d2bd3e7d1c1139acea3b601a Mon Sep 17 00:00:00 2001
From: Don Strawsburg <don@goforward.group>
Date: Sat, 24 Jan 2026 09:54:27 -0500
Subject: [PATCH] fixed to docker-compose

---
 docker/docker-compose.yaml                                  | 6 +++---
 push-image.sh                                               | 2 +-
 .../group/goforward/battlbuilder/config/CorsConfig.java     | 6 ++++--
 .../group/goforward/battlbuilder/config/SecurityConfig.java | 5 ++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index cf743df..e6af633 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -34,12 +34,12 @@ services:
       - battlbuilder-api
     networks:
       - app-network
-      - nginx_nginx
+#      - nginx_nginx
 
 
 # --- Docker Network for Inter-Container Communication ---
 networks:
   app-network:
     external: false
-  nginx_nginx:
-    external: true
+ # nginx_nginx:
+  #  external: true
diff --git a/push-image.sh b/push-image.sh
index b2439fc..8ea12d1 100755
--- a/push-image.sh
+++ b/push-image.sh
@@ -10,7 +10,7 @@ TAG=$(git rev-parse --short HEAD)
 FULL_IMAGE="$REGISTRY/$OWNER/$IMAGE"
 
 echo "Building $FULL_IMAGE:$TAG"
-docker build -f docker/backend/Dockerfile -t $FULL_IMAGE:$TAG .
+docker buildx build -f docker/backend/Dockerfile --platform linux/amd64,linux/arm64 --push  -t $FULL_IMAGE:$TAG .
 
 echo "Tagging latest"
 docker tag $FULL_IMAGE:$TAG $FULL_IMAGE:latest
diff --git a/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java b/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java
index 5932963..64b9db3 100644
--- a/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java
+++ b/src/main/java/group/goforward/battlbuilder/config/CorsConfig.java
@@ -22,11 +22,13 @@ public class CorsConfig {
 
         // Allow Angular development server
         config.setAllowedOrigins(Arrays.asList(
-                "http://localhost:3000",   // local dev
+                "http://localhost:3000",
+                "http://localhost:3001", // local dev
                 "https://localhost:3000",  // local https dev (if used)
                 "https://battl.builders",
                 "http://bb-web-app:3001",
-                "http://bb-web-app:3000"
+                "http://bb-web-app:3000",
+                "http://bb-web-app"
                 ));   // production frontend));
 
 
diff --git a/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java b/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java
index a50919c..cb1a31f 100644
--- a/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java
+++ b/src/main/java/group/goforward/battlbuilder/config/SecurityConfig.java
@@ -80,10 +80,13 @@ public class SecurityConfig {
         CorsConfiguration cfg = new CorsConfiguration();
         cfg.setAllowedOrigins(Arrays.asList(
                 "http://localhost:3000",   // local dev
+                "http://localhost:3001",
                 "https://localhost:3000",  // local https dev (if used)
                 "https://battl.builders",
                 "http://bb-web-app:3001",
-                "http://bb-web-app:3000"));   // production frontend));
+                "http://bb-web-app:3000",
+                "http://bb-web-app"
+        ));   // production frontend));
         cfg.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
         cfg.setAllowedHeaders(List.of("Authorization", "Content-Type"));
         cfg.setExposedHeaders(List.of("Authorization"));