From 0b0c33cfee66264fff95f8ae9ff717e13235ccca Mon Sep 17 00:00:00 2001
From: bunker-admin <admin@thebunkerops.ca>
Date: Wed, 8 Apr 2026 16:12:53 -0600
Subject: [PATCH] Add ccp-agent to build pipeline and fix registry image name

- Added ccp-agent as 5th service in build-and-push.sh (builds from
  changemaker-control-panel/agent/Dockerfile)
- Fixed prod compose image name to match registry convention:
  changemaker-ccp-agent (consistent with changemaker-api, etc.)

Bunker Admin
---
 docker-compose.prod.yml   |  2 +-
 scripts/build-and-push.sh | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 084ee9f3..5bd90fa7 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1333,7 +1333,7 @@ services:
   # =========================================================================
 
   ccp-agent:
-    image: ${GITEA_REGISTRY:-gitea.bnkops.com/admin}/ccp-agent:${IMAGE_TAG:-latest}
+    image: ${GITEA_REGISTRY:-gitea.bnkops.com/admin}/changemaker-ccp-agent:${IMAGE_TAG:-latest}
     container_name: ${COMPOSE_PROJECT_NAME:-changemaker-lite}-ccp-agent
     restart: unless-stopped
     profiles: ["ccp-agent"]
diff --git a/scripts/build-and-push.sh b/scripts/build-and-push.sh
index 41ae57c0..04ebbdc4 100755
--- a/scripts/build-and-push.sh
+++ b/scripts/build-and-push.sh
@@ -9,7 +9,7 @@
 #
 # Options:
 #   --services a,b,c      Comma-separated list of services to build
-#                         (default: api admin media-api nginx)
+#                         (default: api admin media-api nginx ccp-agent)
 #   --no-push             Build only, skip push (verify builds work)
 #   --tag TAG             Override commit SHA tag (default: git rev-parse --short HEAD)
 #   --registry URL        Override registry (default: gitea.bnkops.com/admin)
@@ -28,7 +28,7 @@ PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
 REGISTRY="${GITEA_REGISTRY:-gitea.bnkops.com/admin}"
 COMMIT_SHA="$(git -C "$PROJECT_DIR" rev-parse --short HEAD 2>/dev/null || echo "local")"
 TAG="${COMMIT_SHA}"
-SERVICES="api admin media-api nginx"
+SERVICES="api admin media-api nginx ccp-agent"
 NO_PUSH=false
 DRY_RUN=false
 
@@ -111,6 +111,14 @@ build_service() {
         --load \
         "${PROJECT_DIR}/nginx"
       ;;
+    ccp-agent)
+      info "Building ccp-agent (remote management agent)..."
+      run docker buildx build \
+        --tag "${image}" \
+        --tag "${image_latest}" \
+        --load \
+        "${PROJECT_DIR}/changemaker-control-panel/agent"
+      ;;
     *)
       error "Unknown service: $svc"
       return 1