Add Dockerfile.render and make deployment idempotent

- Add docker/Dockerfile.render (copy of Dockerfile.fly)
- Make deploy script idempotent (detect existing service and update)
- Auto-detect current git branch for deployment
- Update render.yaml to use Dockerfile.render
- Script now updates existing service instead of creating duplicate

Author: andrewm4894

docker/Dockerfile.render

@@ -0,0 +1,95 @@
+FROM python:3.12-slim
+
+# Cache busting argument (set during build to force fresh layers)
+ARG CACHEBUST=4
+
+# Use CACHEBUST to invalidate cache when needed (this layer changes when CACHEBUST changes)
+RUN echo "Cache bust: $CACHEBUST" > /tmp/cachebust
+
+# Install system dependencies including nginx
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    git \
+    build-essential \
+    curl \
+    cmake \
+    nginx \
+    apache2-utils \
+    net-tools \
+    netcat-openbsd \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt/dagster/app
+
+# Copy requirements and install Python dependencies
+COPY requirements.txt requirements-dashboard.txt ./
+RUN pip install --no-cache-dir -r requirements.txt && \
+    pip install --no-cache-dir -r requirements-dashboard.txt
+
+# Copy application code
+COPY anomstack ./anomstack
+COPY dashboard ./dashboard
+COPY metrics ./metrics
+
+# Capture git commit hash for version info
+ARG ANOMSTACK_BUILD_HASH
+ENV ANOMSTACK_BUILD_HASH=${ANOMSTACK_BUILD_HASH}
+
+# Copy configuration files  
+COPY dagster_fly.yaml ./dagster_home/dagster.yaml
+COPY workspace.yaml ./dagster_home/workspace.yaml
+# Copy startup scripts (use CACHEBUST arg above to ensure fresh copy when needed)
+COPY scripts/deployment/start.sh /opt/dagster/start.sh
+COPY scripts/deployment/debug_grpc.sh /opt/dagster/debug_grpc.sh
+
+# Verify files were copied and create any missing directories
+RUN ls -la ./dagster_home/ && \
+    mkdir -p /opt/dagster/dagster_home && \
+    cp -r ./dagster_home/* /opt/dagster/dagster_home/ && \
+    ls -la /opt/dagster/dagster_home/ && \
+    chmod +x /opt/dagster/start.sh && \
+    chmod +x /opt/dagster/debug_grpc.sh
+
+# Create necessary directories for SQLite storage and artifacts  
+# Clear any existing Dagster storage to force fresh workspace loading
+RUN mkdir -p /data/models /data/dagster_storage /data/artifacts /tmp/dagster/compute_logs && \
+    rm -rf /data/dagster_storage/* 2>/dev/null || true
+
+# Environment setup
+ENV DAGSTER_HOME=/opt/dagster/dagster_home
+ENV PYTHONPATH=/opt/dagster/app
+ENV ANOMSTACK_DUCKDB_PATH=/data/anomstack.db
+ENV ANOMSTACK_MODEL_PATH=local:///data/models
+ENV ANOMSTACK_TABLE_KEY=metrics
+
+# Copy example environment file
+COPY .example.env .env
+
+# Health check script
+RUN echo '#!/bin/bash\n\
+if curl -f http://localhost:3000/server_info 2>/dev/null; then\n\
+    echo "Dagster webserver healthy"\n\
+    exit 0\n\
+else\n\
+    echo "Dagster webserver not responding"\n\
+    exit 1\n\
+fi' > /usr/local/bin/health-check.sh && chmod +x /usr/local/bin/health-check.sh
+
+# Setup nginx
+COPY nginx.conf /etc/nginx/nginx.conf
+# Password file will be created at runtime from environment variables
+
+# Create nginx directories
+RUN mkdir -p /var/log/nginx && \
+    chown -R www-data:www-data /var/log/nginx && \
+    ln -sf /dev/stdout /var/log/nginx/access.log && \
+    ln -sf /dev/stderr /var/log/nginx/error.log
+
+# Expose ports (nginx will handle routing)
+EXPOSE 80
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \
+    CMD /usr/local/bin/health-check.sh
+
+# Use simple startup script
+CMD ["/opt/dagster/start.sh"]

render.yaml

@@ -6,7 +6,7 @@ services:
     branch: main
     region: oregon  # Choose: oregon, frankfurt, singapore, ohio, virginia
     plan: starter  # starter, standard, pro, pro_plus (upgrade as needed)
-    dockerfilePath: ./docker/Dockerfile.fly
+    dockerfilePath: ./docker/Dockerfile.render
     dockerContext: ./
     numInstances: 1
 

scripts/deployment/deploy_render_api.sh

@@ -23,7 +23,7 @@ REGION="oregon"
 PLAN="starter"
 DISK_SIZE_GB=10
 GITHUB_REPO="https://github.com/andrewm4894/anomstack"
-BRANCH="main"
+BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
 CONFIRM=false
 
 # Parse arguments
@@ -44,6 +44,7 @@ echo -e "${BLUE}╚════════════════════
 echo ""
 echo "  Service Name: $SERVICE_NAME"
 echo "  Profile:      $PROFILE"
+echo "  Branch:       $BRANCH"
 echo "  Region:       $REGION"
 echo "  Plan:         $PLAN"
 echo "  Disk Size:    ${DISK_SIZE_GB}GB"
@@ -79,6 +80,21 @@ fi
 
 echo -e "${GREEN}✅ Owner ID: $OWNER_ID${NC}"
 
+# Check if service already exists
+echo -e "${BLUE}🔍 Checking if service '$SERVICE_NAME' already exists...${NC}"
+EXISTING_SERVICE=$(curl -s -H "Authorization: Bearer $RENDER_API_KEY" \
+    "https://api.render.com/v1/services" | jq -r ".[] | select(.service.name == \"$SERVICE_NAME\") | .service.id")
+
+if [ -n "$EXISTING_SERVICE" ]; then
+    echo -e "${YELLOW}⚠️  Service '$SERVICE_NAME' already exists (ID: $EXISTING_SERVICE)${NC}"
+    echo -e "${YELLOW}⚠️  Will update existing service instead of creating new one${NC}"
+    SERVICE_ID="$EXISTING_SERVICE"
+    UPDATE_MODE=true
+else
+    echo -e "${GREEN}✅ Service does not exist, will create new service${NC}"
+    UPDATE_MODE=false
+fi
+
 # Load profile environment variables
 PROFILE_FILE="$PROJECT_ROOT/profiles/${PROFILE}.env"
 if [ ! -f "$PROFILE_FILE" ]; then
@@ -148,7 +164,7 @@ PAYLOAD=$(cat <<EOF
       "sizeGB": $DISK_SIZE_GB
     },
     "envSpecificDetails": {
-      "dockerfilePath": "./docker/Dockerfile.fly",
+      "dockerfilePath": "./docker/Dockerfile.render",
       "dockerContext": ".",
       "dockerCommand": ""
     },
@@ -174,52 +190,110 @@ else
 fi
 
 echo ""
-echo -e "${BLUE}🚀 Creating service...${NC}"
-
-# Create service via API
-RESPONSE=$(curl -s -w "\n%{http_code}" \
-    -X POST "https://api.render.com/v1/services" \
-    -H "Authorization: Bearer $RENDER_API_KEY" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -d "$PAYLOAD")
-
-HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
-BODY=$(echo "$RESPONSE" | sed '$d')
-
-if [ "$HTTP_CODE" = "201" ] || [ "$HTTP_CODE" = "200" ]; then
-    echo -e "${GREEN}✅ Service created successfully!${NC}"
-    echo ""
-
-    SERVICE_ID=$(echo "$BODY" | jq -r '.service.id // .id' 2>/dev/null)
-    SERVICE_URL=$(echo "$BODY" | jq -r '.service.serviceDetails.url // .serviceDetails.url // empty' 2>/dev/null)
-
-    echo -e "${GREEN}Service Details:${NC}"
-    echo "  Service ID: $SERVICE_ID"
-    [ -n "$SERVICE_URL" ] && echo "  URL: https://$SERVICE_URL"
-    echo ""
 
-    echo -e "${BLUE}📋 Next Steps:${NC}"
-    echo "  1. View deployment: https://dashboard.render.com/web/$SERVICE_ID"
-    echo "  2. Set ANOMSTACK_ADMIN_PASSWORD secret:"
-    echo "     - Go to service → Environment"
-    echo "     - Mark ANOMSTACK_ADMIN_PASSWORD as secret"
-    echo "     - Set your admin password"
-    echo "  3. Wait for build to complete (~5-10 minutes)"
-    echo "  4. Access dashboard: https://$SERVICE_URL"
-    echo ""
-
-    echo -e "${BLUE}💡 View logs:${NC}"
-    echo "  export RENDER_SERVICE_ID=$SERVICE_ID"
-    echo "  make render-logs"
-    echo ""
+if [ "$UPDATE_MODE" = true ]; then
+    echo -e "${BLUE}🔄 Updating existing service...${NC}"
+
+    # Update service via API (PATCH)
+    UPDATE_PAYLOAD=$(echo "$PAYLOAD" | jq 'del(.type, .ownerId, .name)')
+
+    RESPONSE=$(curl -s -w "\n%{http_code}" \
+        -X PATCH "https://api.render.com/v1/services/$SERVICE_ID" \
+        -H "Authorization: Bearer $RENDER_API_KEY" \
+        -H "Content-Type: application/json" \
+        -H "Accept: application/json" \
+        -d "$UPDATE_PAYLOAD")
+
+    HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
+    BODY=$(echo "$RESPONSE" | sed '$d')
+
+    if [ "$HTTP_CODE" = "200" ]; then
+        echo -e "${GREEN}✅ Service updated successfully!${NC}"
+        echo ""
+
+        SERVICE_URL=$(echo "$BODY" | jq -r '.service.serviceDetails.url // .serviceDetails.url // empty' 2>/dev/null)
+
+        echo -e "${GREEN}Service Details:${NC}"
+        echo "  Service ID: $SERVICE_ID"
+        [ -n "$SERVICE_URL" ] && echo "  URL: https://$SERVICE_URL"
+        echo ""
+
+        # Trigger new deploy after update
+        echo -e "${BLUE}🚀 Triggering new deployment...${NC}"
+        DEPLOY_RESPONSE=$(curl -s -X POST "https://api.render.com/v1/services/$SERVICE_ID/deploys" \
+            -H "Authorization: Bearer $RENDER_API_KEY" \
+            -H "Content-Type: application/json" \
+            -d '{"clearCache": "do_not_clear"}')
+
+        DEPLOY_ID=$(echo "$DEPLOY_RESPONSE" | jq -r '.id')
+        echo -e "${GREEN}✅ Deploy triggered (ID: $DEPLOY_ID)${NC}"
+    else
+        echo -e "${RED}❌ Failed to update service (HTTP $HTTP_CODE)${NC}"
+        echo ""
+        echo "Response:"
+        echo "$BODY" | jq '.' 2>/dev/null || echo "$BODY"
+        echo ""
+        exit 1
+    fi
 else
-    echo -e "${RED}❌ Failed to create service (HTTP $HTTP_CODE)${NC}"
-    echo ""
-    echo "Response:"
-    echo "$BODY" | jq '.' 2>/dev/null || echo "$BODY"
-    echo ""
-    exit 1
+    echo -e "${BLUE}🚀 Creating new service...${NC}"
+
+    # Create service via API
+    RESPONSE=$(curl -s -w "\n%{http_code}" \
+        -X POST "https://api.render.com/v1/services" \
+        -H "Authorization: Bearer $RENDER_API_KEY" \
+        -H "Content-Type: application/json" \
+        -H "Accept: application/json" \
+        -d "$PAYLOAD")
+
+    HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
+    BODY=$(echo "$RESPONSE" | sed '$d')
+
+    if [ "$HTTP_CODE" = "201" ] || [ "$HTTP_CODE" = "200" ]; then
+        echo -e "${GREEN}✅ Service created successfully!${NC}"
+        echo ""
+
+        SERVICE_ID=$(echo "$BODY" | jq -r '.service.id // .id' 2>/dev/null)
+        SERVICE_URL=$(echo "$BODY" | jq -r '.service.serviceDetails.url // .serviceDetails.url // empty' 2>/dev/null)
+
+        echo -e "${GREEN}Service Details:${NC}"
+        echo "  Service ID: $SERVICE_ID"
+        [ -n "$SERVICE_URL" ] && echo "  URL: https://$SERVICE_URL"
+        echo ""
+
+        # Trigger initial deploy
+        echo -e "${BLUE}🚀 Triggering initial deployment...${NC}"
+        DEPLOY_RESPONSE=$(curl -s -X POST "https://api.render.com/v1/services/$SERVICE_ID/deploys" \
+            -H "Authorization: Bearer $RENDER_API_KEY" \
+            -H "Content-Type: application/json" \
+            -d '{"clearCache": "do_not_clear"}')
+
+        DEPLOY_ID=$(echo "$DEPLOY_RESPONSE" | jq -r '.id')
+        echo -e "${GREEN}✅ Deploy triggered (ID: $DEPLOY_ID)${NC}"
+    else
+        echo -e "${RED}❌ Failed to create service (HTTP $HTTP_CODE)${NC}"
+        echo ""
+        echo "Response:"
+        echo "$BODY" | jq '.' 2>/dev/null || echo "$BODY"
+        echo ""
+        exit 1
+    fi
 fi
 
+echo ""
+echo -e "${BLUE}📋 Next Steps:${NC}"
+echo "  1. View deployment: https://dashboard.render.com/web/$SERVICE_ID"
+echo "  2. Set ANOMSTACK_ADMIN_PASSWORD secret (if not already set):"
+echo "     - Go to service → Environment"
+echo "     - Mark ANOMSTACK_ADMIN_PASSWORD as secret"
+echo "     - Set your admin password"
+echo "  3. Wait for build to complete (~5-10 minutes)"
+echo "  4. Access dashboard: https://anomstack-demo.onrender.com"
+echo ""
+
+echo -e "${BLUE}💡 View logs:${NC}"
+echo "  export RENDER_SERVICE_ID=$SERVICE_ID"
+echo "  make render-logs"
+echo ""
+
 echo -e "${GREEN}✅ Deployment initiated successfully!${NC}"