optimize build

Author: zonblade

build-docker/alpine/Dockerfile

@@ -2,26 +2,21 @@
 FROM rust:alpine AS builder
 WORKDIR /app
 
-# Better build environment for Rust + musl
+# Install build dependencies
 RUN apk add --no-cache \
     build-base \
     cmake \
-    musl-dev \
-    pkgconfig \
+    musl-dev\
     perl \
+    perl-utils \
+    perl-dev \
     sqlite-dev \
-    openssl-dev \
-    openssl-libs-static
-
-# Optimize Rust compilation for musl
-ENV RUSTFLAGS="-C target-feature=-crt-static -C link-arg=-s"
-ENV CARGO_BUILD_TARGET="x86_64-unknown-linux-musl"
-RUN rustup target add x86_64-unknown-linux-musl
+    openssl-dev
 
 COPY . .
-RUN cargo build -p router-cli --release --target x86_64-unknown-linux-musl
-RUN cargo build -p router-core --release --target x86_64-unknown-linux-musl
-RUN cargo build -p router-api --release --target x86_64-unknown-linux-musl
+RUN cargo build -p router-cli --release
+RUN cargo build -p router-core --release
+RUN cargo build -p router-api --release
 
 # Runtime image stage
 FROM alpine:latest
@@ -31,7 +26,8 @@ WORKDIR /app
 RUN apk add --no-cache \
     ca-certificates \
     bash \
-    sqlite-libs
+    sqlite-libs \
+    certbot
 
 # Copy binaries from builder
 COPY --from=builder /app/target/release/router-core /usr/local/bin/router-core

build-docker/alpine/entrypoint.sh

@@ -25,9 +25,42 @@ start_core() {
 # Start API service
 start_api() {
     log "Starting router-api..."
+    
+    # First start the API service
     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: $!)"
+    local api_pid=$!
+    echo $api_pid > "$PID_DIR/api.pid"
+    log "router-api started (PID: $api_pid)"
+    
+    # Wait a moment to check if API started successfully
+    sleep 2
+    
+    # Check if API is still running
+    if kill -0 $api_pid 2>/dev/null; then
+        # Check for config files in order of priority
+        local config_file=""
+        if [ -f "/data/config.yaml" ]; then
+            config_file="/data/config.yaml"
+        elif [ -f "$HOME/config.yaml" ]; then
+            config_file="$HOME/config.yaml"
+        elif [ -f "/app/config.yaml" ]; then
+            config_file="/app/config.yaml"
+        elif [ ! -z "$CONFIG_FILE" ]; then
+            config_file="$CONFIG_FILE"
+        fi
+        
+        if [ ! -z "$config_file" ]; then
+            log "API running successfully, starting gwrs with config: $config_file"
+            nohup gwrs --osenv --config "$config_file" > "$LOG_DIR/gwrs.log" 2> "$LOG_DIR/gwrs.error" &
+            echo $! > "$PID_DIR/gwrs.pid"
+            log "gwrs started (PID: $!)"
+        else
+            log "API running successfully but no config file found, skipping gwrs"
+        fi
+    else
+        log "API failed to start, not running gwrs"
+        rm -f "$PID_DIR/api.pid"
+    fi
 }
 
 # Stop a service