some collective

Author: zonblade

build-docker/alpine/Dockerfile

@@ -19,55 +19,22 @@ RUN cargo build -p router-api --release
 FROM alpine:latest
 WORKDIR /app
 
-# Install OpenRC and other dependencies
+# Install minimal runtime dependencies
 RUN apk add --no-cache \
-    openrc \
     ca-certificates \
-    procps \
-    bash \
-    logrotate
+    bash
 
 # Copy binaries from builder
 COPY --from=builder /app/target/release/router-core /usr/local/bin/router-core
 COPY --from=builder /app/target/release/router-api /usr/local/bin/router-api
 
-# Create necessary directories
-RUN mkdir -p /opt/gwrs/bin && \
-    mkdir -p /opt/gwrs/conf && \
-    mkdir -p /tmp/gwrs/log && \
-    mkdir -p /etc/gwrs/logrotate
+COPY build-docker/alpine/entrypoint.sh /usr/local/bin/entrypoint.sh
 
-# Create symlinks to binaries
-RUN ln -sf /usr/local/bin/router-core /opt/gwrs/bin/router-core && \
-    ln -sf /usr/local/bin/router-api /opt/gwrs/bin/router-api
+# Make everything executable
+RUN chmod +x /usr/local/bin/*
 
-# Create service files directory
-RUN mkdir -p /etc/init.d
-
-# Copy service files
-COPY build-docker/alpine/router-core.initd /etc/init.d/gwrs-core
-COPY build-docker/alpine/router-api.initd /etc/init.d/gwrs-api
-
-# Copy logrotate configuration
-COPY build-docker/alpine/logrotate/gwrs /etc/gwrs/logrotate/
-COPY build-docker/alpine/logrotate/setup.sh /etc/gwrs/logrotate/
-
-# Make the init scripts and logrotate setup executable
-RUN chmod +x /etc/init.d/gwrs-core && \
-    chmod +x /etc/init.d/gwrs-api && \
-    chmod +x /etc/gwrs/logrotate/setup.sh && \
-    /etc/gwrs/logrotate/setup.sh
-
-# Add services to default runlevel
-RUN rc-update add gwrs-core default
-RUN rc-update add gwrs-api default
-
-# Setup entrypoint
-COPY build-docker/alpine/entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-# Expose API
+# Expose API port
 EXPOSE 24042
 
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/sbin/init"]
+# Set entrypoint
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

build-docker/alpine/entrypoint.sh

@@ -1,35 +1,132 @@
 #!/bin/bash
 set -e
 
-# Prepare OpenRC for container environment
-if [ ! -d /run/openrc ]; then
-    mkdir -p /run/openrc
-    touch /run/openrc/softlevel
-fi
-
-# Setup necessary directories for OpenRC
-mkdir -p /tmp/gwrs/log
-mkdir -p /run
-mkdir -p /var/run
-
-# Prevent init scripts from running during install
-echo 'rc_provide="loopback net"' >> /etc/rc.conf
-
-# Setup basic mounts expected by OpenRC
-mount -t proc none /proc
-mount -t sysfs none /sys
-mount -t tmpfs none /run
-
-# Start OpenRC
-if [ "$1" = "/sbin/init" ]; then
-    # Start services directly
-    /sbin/rc-service gwrs-core start
-    /sbin/rc-service gwrs-api start
+# Simple configuration
+LOG_DIR="/tmp/gwrs/log"
+PID_DIR="/tmp/gwrs/pids"
+CHECK_INTERVAL=5
+
+# Create directories
+mkdir -p "$LOG_DIR" "$PID_DIR"
+
+# Logging
+log() {
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" | tee -a "$LOG_DIR/manager.log"
+}
+
+# Start core service
+start_core() {
+    log "Starting router-core..."
+    nohup /usr/local/bin/router-core > "$LOG_DIR/core.log" 2> "$LOG_DIR/core.error" &
+    echo $! > "$PID_DIR/core.pid"
+    log "router-core started (PID: $!)"
+}
+
+# Start API service
+start_api() {
+    log "Starting router-api..."
+    nohup /usr/local/bin/router-api > "$LOG_DIR/api.log" 2> "$LOG_DIR/api.error" &
+    echo $! > "$PID_DIR/api.pid"
+    log "router-api started (PID: $!)"
+}
+
+# Stop a service
+stop_service() {
+    local service=$1
+    local pid_file="$PID_DIR/${service}.pid"
+    
+    if [ -f "$pid_file" ]; then
+        local pid=$(cat "$pid_file")
+        if kill -0 $pid 2>/dev/null; then
+            log "Stopping $service (PID: $pid)"
+            kill $pid
+            sleep 2
+            # Force kill if still running
+            if kill -0 $pid 2>/dev/null; then
+                kill -9 $pid
+            fi
+        fi
+        rm -f "$pid_file"
+    fi
+}
+
+# Check if service is running
+is_running() {
+    local service=$1
+    local pid_file="$PID_DIR/${service}.pid"
+    
+    if [ -f "$pid_file" ]; then
+        local pid=$(cat "$pid_file")
+        if kill -0 $pid 2>/dev/null; then
+            return 0  # Running
+        else
+            rm -f "$pid_file"  # Clean up stale PID
+        fi
+    fi
+    return 1  # Not running
+}
+
+# Restart core (and then API)
+restart_core() {
+    log "Core is down! Restarting core and API..."
+    
+    # Stop both services
+    stop_service "api"
+    stop_service "core"
 
-    # Keep container running
-    echo "Services started. Container is now running..."
-    exec tail -f /tmp/gwrs/log/core.log /tmp/gwrs/log/api.log
-else
-    # Run command as specified
-    exec "$@"
-fi
+    sleep 2
+    
+    # Start core first
+    start_core
+    sleep 3
+    
+    # Then start API
+    start_api
+}
+
+# Restart API only
+restart_api() {
+    log "API is down! Restarting API..."
+    stop_service "api"
+    sleep 2
+    start_api
+}
+
+# Monitor services
+monitor() {
+    log "Starting service monitor..."
+    
+    while true; do
+        # Check core
+        if ! is_running "core"; then
+            restart_core
+        # Check API (only if core is running)
+        elif ! is_running "api"; then
+            restart_api
+        fi
+        
+        sleep $CHECK_INTERVAL
+    done
+}
+
+# Cleanup on exit
+cleanup() {
+    log "Shutting down services..."
+    stop_service "api"
+    stop_service "core"
+    exit 0
+}
+
+# Handle signals
+trap cleanup SIGTERM SIGINT
+
+# Main execution
+log "=== Router Process Manager Starting ==="
+
+# Start both services
+start_core
+sleep 3  # Give core time to start
+start_api
+
+# Monitor forever
+monitor