Switch to Brian's registry at 192.168.86.11:30095, add CI build+push+deploy jobs
- All services pull from 192.168.86.11:30095 instead of localhost:5000 - Removed self-hosted registry container (Brian runs his own) - CI workflows: test → build → push to registry → deploy - build-push.sh and watch-loop.sh updated with new registry address
This commit is contained in:
@@ -49,3 +49,18 @@ jobs:
|
|||||||
- name: Test
|
- name: Test
|
||||||
run: cd $GITHUB_WORKSPACE/products/02-iac-drift-detection/saas && npm 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
|
||||||
|
|||||||
@@ -24,3 +24,18 @@ jobs:
|
|||||||
- name: Test
|
- name: Test
|
||||||
run: cd $GITHUB_WORKSPACE/products/03-alert-intelligence && npm 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
|
||||||
|
|||||||
@@ -24,3 +24,18 @@ jobs:
|
|||||||
- name: Test
|
- name: Test
|
||||||
run: cd $GITHUB_WORKSPACE/products/04-lightweight-idp && npm 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
|
||||||
|
|||||||
@@ -24,3 +24,18 @@ jobs:
|
|||||||
- name: Test
|
- name: Test
|
||||||
run: cd $GITHUB_WORKSPACE/products/05-aws-cost-anomaly && npm 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
|
||||||
|
|||||||
@@ -24,3 +24,18 @@ jobs:
|
|||||||
- name: Test
|
- name: Test
|
||||||
run: cd $GITHUB_WORKSPACE/products/06-runbook-automation/saas && npm 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
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# dd0c CI Build & Push to Local Registry
|
# 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:
|
# Usage:
|
||||||
# ./build-push.sh # Build all services
|
# ./build-push.sh # Build all services
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
REGISTRY="${REGISTRY:-localhost:5000}"
|
REGISTRY="${REGISTRY:-192.168.86.11:30095}"
|
||||||
RED='\033[0;31m'
|
RED='\033[0;31m'
|
||||||
GREEN='\033[0;32m'
|
GREEN='\033[0;32m'
|
||||||
YELLOW='\033[1;33m'
|
YELLOW='\033[1;33m'
|
||||||
|
|||||||
@@ -47,14 +47,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- meili_data:/meili_data
|
- 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 ---
|
# --- dd0c Products ---
|
||||||
# P1: LLM Cost Router (Rust — API server)
|
# P1: LLM Cost Router (Rust — API server)
|
||||||
@@ -114,7 +106,7 @@ services:
|
|||||||
|
|
||||||
# P2: IaC Drift Detection (SaaS)
|
# P2: IaC Drift Detection (SaaS)
|
||||||
drift:
|
drift:
|
||||||
image: localhost:5000/dd0c-drift:latest
|
image: 192.168.86.11:30095/dd0c-drift:latest
|
||||||
build:
|
build:
|
||||||
context: ./02-iac-drift-detection/saas
|
context: ./02-iac-drift-detection/saas
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
@@ -133,7 +125,7 @@ services:
|
|||||||
|
|
||||||
# P3: Alert Intelligence
|
# P3: Alert Intelligence
|
||||||
alert:
|
alert:
|
||||||
image: localhost:5000/dd0c-alert:latest
|
image: 192.168.86.11:30095/dd0c-alert:latest
|
||||||
build:
|
build:
|
||||||
context: ./03-alert-intelligence
|
context: ./03-alert-intelligence
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
@@ -152,7 +144,7 @@ services:
|
|||||||
|
|
||||||
# P4: Lightweight IDP / Service Catalog
|
# P4: Lightweight IDP / Service Catalog
|
||||||
portal:
|
portal:
|
||||||
image: localhost:5000/dd0c-portal:latest
|
image: 192.168.86.11:30095/dd0c-portal:latest
|
||||||
build:
|
build:
|
||||||
context: ./04-lightweight-idp
|
context: ./04-lightweight-idp
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
@@ -173,7 +165,7 @@ services:
|
|||||||
|
|
||||||
# P5: AWS Cost Anomaly Detection
|
# P5: AWS Cost Anomaly Detection
|
||||||
cost:
|
cost:
|
||||||
image: localhost:5000/dd0c-cost:latest
|
image: 192.168.86.11:30095/dd0c-cost:latest
|
||||||
build:
|
build:
|
||||||
context: ./05-aws-cost-anomaly
|
context: ./05-aws-cost-anomaly
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
@@ -193,7 +185,7 @@ services:
|
|||||||
|
|
||||||
# P6: Runbook Automation (SaaS)
|
# P6: Runbook Automation (SaaS)
|
||||||
run:
|
run:
|
||||||
image: localhost:5000/dd0c-run:latest
|
image: 192.168.86.11:30095/dd0c-run:latest
|
||||||
build:
|
build:
|
||||||
context: ./06-runbook-automation/saas
|
context: ./06-runbook-automation/saas
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
@@ -213,4 +205,3 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
pg_data:
|
pg_data:
|
||||||
meili_data:
|
meili_data:
|
||||||
registry_data:
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ set -euo pipefail
|
|||||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||||
cd "$SCRIPT_DIR"
|
cd "$SCRIPT_DIR"
|
||||||
|
|
||||||
REGISTRY="${REGISTRY:-localhost:5000}"
|
REGISTRY="${REGISTRY:-192.168.86.11:30095}"
|
||||||
LOCK="/tmp/dd0c-watch.lock"
|
LOCK="/tmp/dd0c-watch.lock"
|
||||||
|
|
||||||
# Prevent concurrent runs
|
# Prevent concurrent runs
|
||||||
|
|||||||
Reference in New Issue
Block a user