diff --git a/.gitea/workflows/ci-p2-drift.yml b/.gitea/workflows/ci-p2-drift.yml index 0b9ab52..2da43ce 100644 --- a/.gitea/workflows/ci-p2-drift.yml +++ b/.gitea/workflows/ci-p2-drift.yml @@ -49,3 +49,18 @@ jobs: - name: Test run: cd $GITHUB_WORKSPACE/products/02-iac-drift-detection/saas && npm test + + build-push: + runs-on: ubuntu-latest + needs: test + if: github.ref == 'refs/heads/main' + steps: + - name: Checkout + run: git clone --depth=1 http://192.168.86.11:3005/jarvis/dd0c.git $GITHUB_WORKSPACE || true + - name: Build and push + run: | + cd $GITHUB_WORKSPACE/products + docker build -t 192.168.86.11:30095/dd0c-drift:latest ./02-iac-drift-detection/saas + docker push 192.168.86.11:30095/dd0c-drift:latest + - name: Deploy + run: cd $GITHUB_WORKSPACE/products && docker compose pull drift && docker compose up -d drift diff --git a/.gitea/workflows/ci-p3-alert.yml b/.gitea/workflows/ci-p3-alert.yml index e11abdf..aa9bfc9 100644 --- a/.gitea/workflows/ci-p3-alert.yml +++ b/.gitea/workflows/ci-p3-alert.yml @@ -24,3 +24,18 @@ jobs: - name: Test run: cd $GITHUB_WORKSPACE/products/03-alert-intelligence && npm test + + build-push: + runs-on: ubuntu-latest + needs: test + if: github.ref == 'refs/heads/main' + steps: + - name: Checkout + run: git clone --depth=1 http://192.168.86.11:3005/jarvis/dd0c.git $GITHUB_WORKSPACE || true + - name: Build and push + run: | + cd $GITHUB_WORKSPACE/products + docker build -t 192.168.86.11:30095/dd0c-alert:latest ./03-alert-intelligence + docker push 192.168.86.11:30095/dd0c-alert:latest + - name: Deploy + run: cd $GITHUB_WORKSPACE/products && docker compose pull alert && docker compose up -d alert diff --git a/.gitea/workflows/ci-p4-portal.yml b/.gitea/workflows/ci-p4-portal.yml index 9d3a2a6..68bdc1a 100644 --- a/.gitea/workflows/ci-p4-portal.yml +++ b/.gitea/workflows/ci-p4-portal.yml @@ -24,3 +24,18 @@ jobs: - name: Test run: cd $GITHUB_WORKSPACE/products/04-lightweight-idp && npm test + + build-push: + runs-on: ubuntu-latest + needs: test + if: github.ref == 'refs/heads/main' + steps: + - name: Checkout + run: git clone --depth=1 http://192.168.86.11:3005/jarvis/dd0c.git $GITHUB_WORKSPACE || true + - name: Build and push + run: | + cd $GITHUB_WORKSPACE/products + docker build -t 192.168.86.11:30095/dd0c-portal:latest ./04-lightweight-idp + docker push 192.168.86.11:30095/dd0c-portal:latest + - name: Deploy + run: cd $GITHUB_WORKSPACE/products && docker compose pull portal && docker compose up -d portal diff --git a/.gitea/workflows/ci-p5-cost.yml b/.gitea/workflows/ci-p5-cost.yml index 49dd0e5..dcf03c4 100644 --- a/.gitea/workflows/ci-p5-cost.yml +++ b/.gitea/workflows/ci-p5-cost.yml @@ -24,3 +24,18 @@ jobs: - name: Test run: cd $GITHUB_WORKSPACE/products/05-aws-cost-anomaly && npm test + + build-push: + runs-on: ubuntu-latest + needs: test + if: github.ref == 'refs/heads/main' + steps: + - name: Checkout + run: git clone --depth=1 http://192.168.86.11:3005/jarvis/dd0c.git $GITHUB_WORKSPACE || true + - name: Build and push + run: | + cd $GITHUB_WORKSPACE/products + docker build -t 192.168.86.11:30095/dd0c-cost:latest ./05-aws-cost-anomaly + docker push 192.168.86.11:30095/dd0c-cost:latest + - name: Deploy + run: cd $GITHUB_WORKSPACE/products && docker compose pull cost && docker compose up -d cost diff --git a/.gitea/workflows/ci-p6-run.yml b/.gitea/workflows/ci-p6-run.yml index 705cc47..6f3d0f8 100644 --- a/.gitea/workflows/ci-p6-run.yml +++ b/.gitea/workflows/ci-p6-run.yml @@ -24,3 +24,18 @@ jobs: - name: Test run: cd $GITHUB_WORKSPACE/products/06-runbook-automation/saas && npm test + + build-push: + runs-on: ubuntu-latest + needs: test + if: github.ref == 'refs/heads/main' + steps: + - name: Checkout + run: git clone --depth=1 http://192.168.86.11:3005/jarvis/dd0c.git $GITHUB_WORKSPACE || true + - name: Build and push + run: | + cd $GITHUB_WORKSPACE/products + docker build -t 192.168.86.11:30095/dd0c-run:latest ./06-runbook-automation/saas + docker push 192.168.86.11:30095/dd0c-run:latest + - name: Deploy + run: cd $GITHUB_WORKSPACE/products && docker compose pull run && docker compose up -d run diff --git a/products/build-push.sh b/products/build-push.sh index 132c9e5..1a081bd 100755 --- a/products/build-push.sh +++ b/products/build-push.sh @@ -1,7 +1,7 @@ #!/bin/bash # dd0c CI Build & Push to Local Registry -# Builds Docker images for all Node services and pushes to localhost:5000 +# Builds Docker images for all Node services and pushes to 192.168.86.11:30095 # # Usage: # ./build-push.sh # Build all services @@ -9,7 +9,7 @@ set -euo pipefail -REGISTRY="${REGISTRY:-localhost:5000}" +REGISTRY="${REGISTRY:-192.168.86.11:30095}" RED='\033[0;31m' GREEN='\033[0;32m' YELLOW='\033[1;33m' diff --git a/products/docker-compose.yml b/products/docker-compose.yml index 20b52ff..71b4389 100644 --- a/products/docker-compose.yml +++ b/products/docker-compose.yml @@ -47,14 +47,6 @@ services: volumes: - meili_data:/meili_data - # --- Local Docker Registry --- - registry: - image: registry:2 - ports: - - "5000:5000" - volumes: - - registry_data:/var/lib/registry - restart: unless-stopped # --- dd0c Products --- # P1: LLM Cost Router (Rust — API server) @@ -114,7 +106,7 @@ services: # P2: IaC Drift Detection (SaaS) drift: - image: localhost:5000/dd0c-drift:latest + image: 192.168.86.11:30095/dd0c-drift:latest build: context: ./02-iac-drift-detection/saas dockerfile: Dockerfile @@ -133,7 +125,7 @@ services: # P3: Alert Intelligence alert: - image: localhost:5000/dd0c-alert:latest + image: 192.168.86.11:30095/dd0c-alert:latest build: context: ./03-alert-intelligence dockerfile: Dockerfile @@ -152,7 +144,7 @@ services: # P4: Lightweight IDP / Service Catalog portal: - image: localhost:5000/dd0c-portal:latest + image: 192.168.86.11:30095/dd0c-portal:latest build: context: ./04-lightweight-idp dockerfile: Dockerfile @@ -173,7 +165,7 @@ services: # P5: AWS Cost Anomaly Detection cost: - image: localhost:5000/dd0c-cost:latest + image: 192.168.86.11:30095/dd0c-cost:latest build: context: ./05-aws-cost-anomaly dockerfile: Dockerfile @@ -193,7 +185,7 @@ services: # P6: Runbook Automation (SaaS) run: - image: localhost:5000/dd0c-run:latest + image: 192.168.86.11:30095/dd0c-run:latest build: context: ./06-runbook-automation/saas dockerfile: Dockerfile @@ -213,4 +205,3 @@ services: volumes: pg_data: meili_data: - registry_data: diff --git a/products/watch-loop.sh b/products/watch-loop.sh index 37434c5..bd6c21b 100755 --- a/products/watch-loop.sh +++ b/products/watch-loop.sh @@ -9,7 +9,7 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" cd "$SCRIPT_DIR" -REGISTRY="${REGISTRY:-localhost:5000}" +REGISTRY="${REGISTRY:-192.168.86.11:30095}" LOCK="/tmp/dd0c-watch.lock" # Prevent concurrent runs