Merge pull request #145 from rostilos/1.5.1-rc

1.5.1 rc

Author: rostilos

.github/workflows/deploy.yml

@@ -5,7 +5,7 @@
 #
 # Flow:
 #   1. Checkout code (with submodules)
-#   2. Build Java artifacts (Maven)
+#   2. Build & test Java artifacts (Maven + JaCoCo)
 #   3. Build all 5 Docker images
 #   4. Save images as a compressed tarball
 #   5. SCP tarball to production server
@@ -42,7 +42,7 @@ env:
 
 jobs:
   build:
-    name: Build Docker Images
+    name: Build & Test → Docker Images
     runs-on: ubuntu-latest
     if: github.event.inputs.skip_build != 'true'
     timeout-minutes: 30
@@ -73,11 +73,27 @@ jobs:
           chmod +x deployment/ci/ci-build.sh
           deployment/ci/ci-build.sh
 
+      - name: Publish test results
+        if: always()
+        uses: dorny/test-reporter@v1
+        with:
+          name: Java Tests
+          path: java-ecosystem/**/target/surefire-reports/*.xml
+          reporter: java-junit
+
+      - name: Upload test reports
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: surefire-reports
+          path: java-ecosystem/**/target/surefire-reports/
+          retention-days: 7
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: codecrow-images
-          path: build-output/codecrow-images.tar.gz
+          path: build-output/codecrow-images.tar.zst
           retention-days: 7
           compression-level: 0
 
@@ -120,7 +136,7 @@ jobs:
         if: github.event.inputs.skip_build != 'true'
         run: |
           scp -i ~/.ssh/deploy_key \
-            build-output/codecrow-images.tar.gz \
+            build-output/codecrow-images.tar.zst \
             ${{ secrets.DEPLOY_USER }}@${{ secrets.DEPLOY_HOST }}:${{ env.DEPLOY_PATH }}/releases/
 
       - name: Deploy on server

deployment/build/production-build.sh

@@ -11,19 +11,19 @@ CONFIG_PATH="deployment/config"
 
 cd "$(dirname "$0")/../../"
 
-# echo "--- 1. Ensuring frontend submodule is synchronized ---"
-# if [ -d "$FRONTEND_DIR" ] && [ ! -f "$FRONTEND_DIR/.git" ]; then
-#    echo "Stale frontend directory detected (not a submodule). Removing and re-initializing..."
-#    rm -rf "$FRONTEND_DIR"
-#    git submodule update --init --remote -- "$FRONTEND_DIR"
-# elif [ -d "$FRONTEND_DIR" ]; then
-#    echo "Frontend submodule exists. Updating..."
-#    git submodule update --remote -- "$FRONTEND_DIR"
-# else
-#    echo "Initializing frontend submodule..."
-#    git submodule update --init --remote -- "$FRONTEND_DIR"
-# fi
-# (cd "$FRONTEND_DIR" && git checkout "$FRONTEND_BRANCH" && git pull origin "$FRONTEND_BRANCH")
+echo "--- 1. Ensuring frontend submodule is synchronized ---"
+if [ -d "$FRONTEND_DIR" ] && [ ! -f "$FRONTEND_DIR/.git" ]; then
+   echo "Stale frontend directory detected (not a submodule). Removing and re-initializing..."
+   rm -rf "$FRONTEND_DIR"
+   git submodule update --init --remote -- "$FRONTEND_DIR"
+elif [ -d "$FRONTEND_DIR" ]; then
+   echo "Frontend submodule exists. Updating..."
+   git submodule update --remote -- "$FRONTEND_DIR"
+else
+   echo "Initializing frontend submodule..."
+   git submodule update --init --remote -- "$FRONTEND_DIR"
+fi
+(cd "$FRONTEND_DIR" && git checkout "$FRONTEND_BRANCH" && git pull origin "$FRONTEND_BRANCH")
 
 echo "--- 2. Injecting Environment Configurations ---"
 

deployment/ci/ci-build.sh

@@ -2,9 +2,9 @@
 ###############################################################################
 # ci-build.sh — Runs inside the GitHub Actions runner.
 #
-# 1. Builds Java artifacts (Maven)
-# 2. Copies MCP JARs to inference-orchestrator context
-# 3. Writes .env files from GitHub secrets
+# 1. Writes .env files from GitHub secrets
+# 2. Builds & tests Java artifacts (Maven)  — fails fast on test errors
+# 3. Copies MCP JARs to inference-orchestrator context
 # 4. Builds all 5 Docker images
 # 5. Saves them to a single compressed tarball
 #
@@ -48,10 +48,10 @@ if [ -n "${ENV_WEB_FRONTEND:-}" ]; then
   echo "  ✓ web-frontend/.env written"
 fi
 
-# ── 2. Build Java Artifacts ────────────────────────────────────────────────
-echo "--- 2. Building Java artifacts (mvn clean package) ---"
-(cd "$JAVA_DIR" && mvn clean package -DskipTests -q)
-echo "  ✓ Java build complete"
+# ── 2. Build & Test Java Artifacts ─────────────────────────────────────────
+echo "--- 2. Building & testing Java artifacts (mvn clean verify) ---"
+(cd "$JAVA_DIR" && mvn clean verify)
+echo "  ✓ Java build & tests complete"
 
 # ── 3. Copy MCP JARs ──────────────────────────────────────────────────────
 echo "--- 3. Copying MCP server JARs ---"
@@ -96,12 +96,12 @@ for entry in "${IMAGES[@]}"; do
   IMAGE_LIST="$IMAGE_LIST ${IMAGE_NAME}:latest"
 done
 
-docker save $IMAGE_LIST | gzip > "$OUTPUT_DIR/codecrow-images.tar.gz"
+docker save $IMAGE_LIST | zstd -T0 --ultra -20 -o "$OUTPUT_DIR/codecrow-images.tar.zst"
 
-TARBALL_SIZE=$(du -h "$OUTPUT_DIR/codecrow-images.tar.gz" | cut -f1)
-echo "  ✓ Tarball created: codecrow-images.tar.gz ($TARBALL_SIZE)"
+TARBALL_SIZE=$(du -h "$OUTPUT_DIR/codecrow-images.tar.zst" | cut -f1)
+echo "  ✓ Tarball created: codecrow-images.tar.zst ($TARBALL_SIZE)"
 
 echo ""
 echo "=========================================="
-echo "  Build complete! Artifact: build-output/codecrow-images.tar.gz"
+echo "  Build complete! Artifact: build-output/codecrow-images.tar.zst"
 echo "=========================================="

deployment/ci/server-deploy.sh

@@ -16,7 +16,7 @@
 # Usage:
 #   server-deploy.sh [tarball-name]
 #
-# Default tarball: codecrow-images.tar.gz
+# Default tarball: codecrow-images.tar.zst
 ###############################################################################
 set -euo pipefail
 
@@ -25,7 +25,7 @@ RELEASES_DIR="$DEPLOY_DIR/releases"
 CONFIG_DIR="$DEPLOY_DIR/config"
 BACKUP_DIR="$DEPLOY_DIR/backups"
 COMPOSE_FILE="$DEPLOY_DIR/docker-compose.prod.yml"
-TARBALL_NAME="${1:-codecrow-images.tar.gz}"
+TARBALL_NAME="${1:-codecrow-images.tar.zst}"
 TARBALL_PATH="$RELEASES_DIR/$TARBALL_NAME"
 
 echo "=========================================="
@@ -34,6 +34,11 @@ echo "  $(date '+%Y-%m-%d %H:%M:%S')"
 echo "=========================================="
 
 # ── Pre-flight checks ─────────────────────────────────────────────────────
+if ! command -v zstd &>/dev/null; then
+  echo "ERROR: zstd is not installed. Run: sudo apt-get install zstd"
+  exit 1
+fi
+
 if [ ! -f "$TARBALL_PATH" ]; then
   echo "ERROR: Tarball not found: $TARBALL_PATH"
   exit 1
@@ -91,7 +96,7 @@ fi
 
 # ── 2. Load Docker images ─────────────────────────────────────────────────
 echo "--- 2. Loading Docker images from tarball ---"
-docker load -i "$TARBALL_PATH"
+zstd -d --stdout "$TARBALL_PATH" | docker load
 echo "  ✓ Images loaded"
 
 # ── 3. Stop existing services ─────────────────────────────────────────────
@@ -127,8 +132,8 @@ docker compose -f docker-compose.prod.yml ps
 # ── 6. Cleanup old releases (keep last 5) ─────────────────────────────────
 echo "--- 6. Cleaning up old releases and backups ---"
 cd "$RELEASES_DIR"
-ls -1t *.tar.gz 2>/dev/null | tail -n +6 | xargs -r rm -f
-REMAINING=$(ls -1 *.tar.gz 2>/dev/null | wc -l)
+ls -1t *.tar.zst 2>/dev/null | tail -n +6 | xargs -r rm -f
+REMAINING=$(ls -1 *.tar.zst 2>/dev/null | wc -l)
 echo "  ✓ Keeping $REMAINING release(s)"
 
 # Cleanup old DB backups (keep last 10)

deployment/ci/server-init.sh

@@ -17,16 +17,25 @@ echo "=========================================="
 echo "  CodeCrow Server Initialization"
 echo "=========================================="
 
-# ── 1. Create directory structure ──────────────────────────────────────────
-echo "--- 1. Creating directory structure ---"
+# ── 1. Install required packages ───────────────────────────────────────────
+echo "--- 1. Installing required packages ---"
+if ! command -v zstd &>/dev/null; then
+  apt-get update -qq && apt-get install -y -qq zstd
+  echo "  ✓ zstd installed"
+else
+  echo "  ○ zstd already installed"
+fi
+
+# ── 2. Create directory structure ──────────────────────────────────────────
+echo "--- 2. Creating directory structure ---"
 mkdir -p "$DEPLOY_DIR"/{releases,backups,config/{java-shared/github-private-key,inference-orchestrator,rag-pipeline,web-frontend}}
 
-# ── 2. Set ownership ─────────────────────────────────────────────────────
-echo "--- 2. Setting ownership to $DEPLOY_USER ---"
+# ── 3. Set ownership ─────────────────────────────────────────────────────
+echo "--- 3. Setting ownership to $DEPLOY_USER ---"
 chown -R "$DEPLOY_USER:$DEPLOY_USER" "$DEPLOY_DIR"
 
-# ── 3. Create sample config files ────────────────────────────────────────
-echo "--- 3. Creating sample config placeholders ---"
+# ── 4. Create sample config files ────────────────────────────────────────
+echo "--- 4. Creating sample config placeholders ---"
 
 if [ ! -f "$DEPLOY_DIR/config/java-shared/application.properties" ]; then
   cat > "$DEPLOY_DIR/config/java-shared/application.properties" <<'SAMPLE'
@@ -98,7 +107,7 @@ else
   echo "  ○ .env already exists (skipped)"
 fi
 
-# ── 4. Print summary ─────────────────────────────────────────────────────
+# ── 5. Print summary ─────────────────────────────────────────────────────
 echo ""
 echo "=========================================="
 echo "  Server initialized! Directory layout:"
@@ -108,7 +117,7 @@ echo "  $DEPLOY_DIR/"
 echo "  ├── docker-compose.prod.yml   ← copy from repo"
 echo "  ├── server-deploy.sh          ← copy from repo"
 echo "  ├── releases/"
-echo "  │   └── codecrow-images.tar.gz  ← uploaded by CI"
+echo "  │   └── codecrow-images.tar.zst  ← uploaded by CI"
 echo "  └── config/"
 echo "      ├── java-shared/"
 echo "      │   ├── application.properties       ← YOUR secrets"

deployment/docker-compose.prod.yml

@@ -221,7 +221,7 @@ services:
     volumes:
       - web_frontend_logs:/app/logs
     healthcheck:
-      test: ["CMD-SHELL", "wget -qO /dev/null http://localhost:8080 || exit 1"]
+      test: ["CMD-SHELL", "wget -qO /dev/null http://127.0.0.1:8080 || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 5

deployment/docker-compose.yml

@@ -225,6 +225,12 @@ services:
       - codecrow-network
     volumes:
       - web_frontend_logs:/app/logs
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO /dev/null http://127.0.0.1:8080 || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 15s
     restart: unless-stopped
 
   fix-permissions:

frontend

@@ -1,37 +1,17 @@
-FROM maven:latest AS builder
-
-WORKDIR /app
-
-COPY ./target/codecrow-pipeline-agent-1.0.jar ./codecrow-pipeline-agent-1.0.jar
-
-FROM openjdk:17.0.2-jdk-slim-bullseye
+FROM eclipse-temurin:17-jre-alpine
 
-
-RUN apt-get update && \
-    apt-get install -y curl && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN groupadd -r appgroup && useradd -r -g appgroup appuser
-RUN mkdir -p /app/logs && chown -R appuser:appgroup /app
+RUN apk add --no-cache curl && \
+    addgroup -g 1001 -S appgroup && adduser -u 1001 -S appuser -G appgroup && \
+    mkdir -p /app/logs && chown -R appuser:appgroup /app
 
 WORKDIR /app
 
-# Copy the built jar file
-#COPY ./codecrow-pipeline-agent/mcp-server ./codecrow-pipeline-agent/mcp-server
-COPY --from=builder /app/codecrow-pipeline-agent-1.0.jar app.jar
-
-# Change ownership
-RUN chown -R appuser:appgroup /app
+COPY --chown=appuser:appgroup ./target/codecrow-pipeline-agent-1.0.jar app.jar
 
-# Switch to non-root user
 USER appuser
 
-# Expose port
 EXPOSE 8082
 
-# JVM options
 ENV JAVA_OPTS="-Xms512m -Xmx1g -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:+UseStringDeduplication"
 
-# Run the application
 CMD ["sh", "-c", "java $JAVA_OPTS -jar app.jar"]

java-ecosystem/services/pipeline-agent/Dockerfile

@@ -1,23 +1,13 @@
-FROM maven:latest AS builder
+FROM eclipse-temurin:17-jre-alpine
 
-WORKDIR /app
-
-COPY ./target/codecrow-pipeline-agent-1.0.jar ./codecrow-pipeline-agent-1.0.jar
-
-FROM openjdk:17.0.2-jdk-slim-bullseye
-
-RUN apt-get update && \
-    apt-get install -y curl unzip && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN groupadd -r appgroup && useradd -r -g appgroup appuser
-RUN mkdir -p /app/logs && chown -R appuser:appgroup /app
+RUN apk add --no-cache curl unzip && \
+    addgroup -g 1001 -S appgroup && adduser -u 1001 -S appuser -G appgroup && \
+    mkdir -p /app/logs && chown -R appuser:appgroup /app
 
 WORKDIR /app
 
-# Copy the built jar file
-COPY --from=builder /app/codecrow-pipeline-agent-1.0.jar app.jar
+# Copy the built jar file (--chown avoids a duplicate layer)
+COPY --chown=appuser:appgroup ./target/codecrow-pipeline-agent-1.0.jar app.jar
 
 # Download New Relic Java agent (config newrelic.yml is mounted at runtime)
 RUN mkdir -p /usr/local/newrelic && \
@@ -26,23 +16,13 @@ RUN mkdir -p /usr/local/newrelic && \
     unzip -jo /tmp/newrelic-java.zip 'newrelic/newrelic.jar' -d /usr/local/newrelic/ && \
     rm /tmp/newrelic-java.zip && \
     chmod 644 /usr/local/newrelic/newrelic.jar && \
-    chown -R appuser:appgroup /app /usr/local/newrelic
-
-# Change ownership
-RUN chown appuser:appgroup app.jar
+    chown -R appuser:appgroup /usr/local/newrelic
 
-# Switch to non-root user
 USER appuser
 
-# Expose port
 EXPOSE 8082
 
-# New Relic config via environment (override at runtime via docker-compose)
-# NEW_RELIC_APP_NAME and NEW_RELIC_LICENSE_KEY must be set at runtime
 ENV NEW_RELIC_LOG_FILE_NAME=STDOUT
-
-# JVM options
 ENV JAVA_OPTS="-Xms512m -Xmx1g -javaagent:/usr/local/newrelic/newrelic.jar -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:+UseStringDeduplication"
 
-# Run the application
 CMD ["sh", "-c", "java $JAVA_OPTS -jar app.jar"]