From b13c33de98742db59289bb4f62feae71ddba96b4 Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Thu, 12 Feb 2026 10:46:35 +0100 Subject: [PATCH] Cleanup: remove migration code from entrypoint and Dockerfile --- Dockerfile | 19 ++----------------- entrypoint.sh | 46 ---------------------------------------------- 2 files changed, 2 insertions(+), 63 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7201849..4f4e40b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,15 +4,13 @@ COPY go.mod go.sum* ./ RUN go mod download 2>/dev/null || true COPY . . RUN go build -trimpath -ldflags "-s -w" -o /out/telemetry-service . -RUN go build -trimpath -ldflags "-s -w" -o /out/migrate ./migration/migrate.go FROM alpine:3.23 RUN apk add --no-cache ca-certificates tzdata WORKDIR /app COPY --from=build /out/telemetry-service /app/telemetry-service -COPY --from=build /out/migrate /app/migrate COPY entrypoint.sh /app/entrypoint.sh -RUN chmod +x /app/entrypoint.sh /app/migrate +RUN chmod +x /app/entrypoint.sh # Service config ENV LISTEN_ADDR=":8080" @@ -22,30 +20,17 @@ ENV RATE_BURST="20" ENV UPSTREAM_TIMEOUT_MS="4000" ENV ENABLE_REQUEST_LOGGING="false" -# Cache config (optional) +# Cache config ENV ENABLE_CACHE="true" ENV CACHE_TTL_SECONDS="300" ENV ENABLE_REDIS="false" -# ENV REDIS_URL="redis://localhost:6379" # Alert config (optional) ENV ALERT_ENABLED="false" -# ENV SMTP_HOST="" -# ENV SMTP_PORT="587" -# ENV SMTP_USER="" -# ENV SMTP_PASSWORD="" -# ENV SMTP_FROM="telemetry@proxmoxved.local" -# ENV SMTP_TO="" -# ENV SMTP_USE_TLS="false" ENV ALERT_FAILURE_THRESHOLD="20.0" ENV ALERT_CHECK_INTERVAL_MIN="15" ENV ALERT_COOLDOWN_MIN="60" -# Migration config (optional) -ENV RUN_MIGRATION="false" -ENV MIGRATION_REQUIRED="false" -ENV MIGRATION_SOURCE_URL="https://api.htl-braunau.at/dev/data" - EXPOSE 8080 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s \ CMD wget -q --spider http://localhost:8080/healthz || exit 1 diff --git a/entrypoint.sh b/entrypoint.sh index 67c09b2..5d73d67 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,51 +5,5 @@ echo "=============================================" echo " ProxmoxVED Telemetry Service" echo "=============================================" -# Map Coolify ENV names to migration script names -# Coolify uses PB_URL, PB_TARGET_COLLECTION -export POCKETBASE_URL="${POCKETBASE_URL:-$PB_URL}" -export POCKETBASE_COLLECTION="${POCKETBASE_COLLECTION:-$PB_TARGET_COLLECTION}" - -# Run migration if enabled -if [ "$RUN_MIGRATION" = "true" ]; then - echo "" - echo "🔄 Migration mode enabled" - echo " Source: $MIGRATION_SOURCE_URL" - echo " Target: $POCKETBASE_URL" - echo " Collection: $POCKETBASE_COLLECTION" - echo "" - - # Wait for PocketBase to be ready - echo "⏳ Waiting for PocketBase to be ready..." - RETRIES=30 - until wget -q --spider "$POCKETBASE_URL/api/health" 2>/dev/null; do - RETRIES=$((RETRIES - 1)) - if [ $RETRIES -le 0 ]; then - echo "❌ PocketBase not reachable after 30 attempts" - if [ "$MIGRATION_REQUIRED" = "true" ]; then - exit 1 - fi - echo "⚠️ Continuing without migration..." - break - fi - echo " Waiting... ($RETRIES attempts left)" - sleep 2 - done - - if wget -q --spider "$POCKETBASE_URL/api/health" 2>/dev/null; then - echo "✅ PocketBase is ready" - echo "" - echo "🚀 Starting migration..." - /app/migrate || { - if [ "$MIGRATION_REQUIRED" = "true" ]; then - echo "❌ Migration failed!" - exit 1 - fi - echo "⚠️ Migration failed, but continuing..." - } - echo "" - fi -fi - echo "🚀 Starting telemetry service..." exec /app/telemetry-service