diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 8c7054f..15be4ee 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Build & Deploy +name: Build & Deploy KLZ Cables on: push: @@ -10,48 +10,33 @@ jobs: runs-on: docker steps: - # --- Checkout --- - name: Checkout repo uses: actions/checkout@v3 - # --- Tools --- - name: Install tools run: | apt-get update - apt-get install -y \ - docker.io \ - openssh-client \ - rsync + apt-get install -y docker.io openssh-client - # --- Docker registry login --- - name: Login to registry env: REGISTRY_USER: ${{ secrets.REGISTRY_USER }} REGISTRY_PASS: ${{ secrets.REGISTRY_PASS }} run: | - echo "$REGISTRY_PASS" | docker login registry.infra.mintel.me \ - -u "$REGISTRY_USER" \ - --password-stdin + echo "$REGISTRY_PASS" | docker login registry.infra.mintel.me -u "$REGISTRY_USER" --password-stdin - # --- Build image --- - name: Build image run: | - echo "Starting Docker build..." docker build \ --pull \ - -t registry.infra.mintel.me/mintel/mb-grid-solutions:latest . - echo "Docker build completed successfully" - echo "Built image:" - docker images registry.infra.mintel.me/mintel/mb-grid-solutions:latest --format "table {{.Repository}}:{{.Tag}}\t{{.ID}}\t{{.CreatedSince}}" + --build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} \ + --build-arg NEXT_PUBLIC_UMAMI_SCRIPT_URL=${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }} \ + --build-arg NEXT_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \ + -t registry.infra.mintel.me/mintel/klz-cables.com:latest . - # --- Push image --- - name: Push image - run: | - echo "Starting Docker push..." - docker push registry.infra.mintel.me/mintel/mb-grid-solutions:latest - echo "Docker push completed successfully" + run: docker push registry.infra.mintel.me/mintel/klz-cables.com:latest - # --- SSH setup --- - name: Setup SSH run: | mkdir -p ~/.ssh @@ -59,81 +44,94 @@ jobs: chmod 600 ~/.ssh/id_ed25519 ssh-keyscan -H alpha.mintel.me >> ~/.ssh/known_hosts - # --- Sync files --- - - name: Sync files to server + - name: Sync docker-compose file to server run: | - echo "Starting file sync to server..." - echo "Syncing docker-compose.yaml to alpha.mintel.me..." - tar czf - docker-compose.yaml | \ - ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me \ - "mkdir -p /home/deploy/sites/mb-grid-solutions.com/ && tar xzf - -C /home/deploy/sites/mb-grid-solutions.com/ && echo 'Files synced successfully' && ls -la /home/deploy/sites/mb-grid-solutions.com/" - echo "File sync completed" + echo "Checking for docker-compose file..." + + COMPOSE_FILE="" + if [ -f "docker-compose.yml" ]; then + COMPOSE_FILE="docker-compose.yml" + elif [ -f "docker-compose.yaml" ]; then + COMPOSE_FILE="docker-compose.yaml" + else + echo "ERROR: Keine docker-compose.yml oder .yaml gefunden!" + exit 1 + fi + + echo "Found and syncing: $COMPOSE_FILE" + + # Verzeichnis vorbereiten + ssh -i ~/.ssh/id_ed25519 \ + -o StrictHostKeyChecking=no \ + -o ServerAliveInterval=60 \ + -o ServerAliveCountMax=5 \ + -o TCPKeepAlive=yes \ + deploy@alpha.mintel.me \ + "mkdir -p /home/deploy/sites/klz-cables.com && chmod 775 /home/deploy/sites/klz-cables.com" + + # Datei kopieren mit KeepAlive + scp -i ~/.ssh/id_ed25519 \ + -o StrictHostKeyChecking=no \ + -o ServerAliveInterval=60 \ + -o ServerAliveCountMax=5 \ + -o TCPKeepAlive=yes \ + "$COMPOSE_FILE" \ + deploy@alpha.mintel.me:/home/deploy/sites/klz-cables.com/"$COMPOSE_FILE" + + # varnish optional + if [ -d "./varnish" ]; then + scp -r -i ~/.ssh/id_ed25519 \ + -o StrictHostKeyChecking=no \ + -o ServerAliveInterval=60 \ + -o ServerAliveCountMax=5 \ + -o TCPKeepAlive=yes \ + varnish/ deploy@alpha.mintel.me:/home/deploy/sites/klz-cables.com/ + echo "varnish synced" + fi + + # Rechte + Log-Nachweis + ssh -i ~/.ssh/id_ed25519 \ + -o StrictHostKeyChecking=no \ + -o ServerAliveInterval=60 \ + -o ServerAliveCountMax=5 \ + -o TCPKeepAlive=yes \ + deploy@alpha.mintel.me \ + "chmod 664 /home/deploy/sites/klz-cables.com/$COMPOSE_FILE && \ + ls -la /home/deploy/sites/klz-cables.com/ && \ + stat /home/deploy/sites/klz-cables.com/$COMPOSE_FILE && \ + echo 'Sync completed - using: $COMPOSE_FILE'" - # --- Deploy --- - name: Deploy on server env: REGISTRY_USER: ${{ secrets.REGISTRY_USER }} REGISTRY_PASS: ${{ secrets.REGISTRY_PASS }} run: | - echo "Starting deployment on server..." - ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o IPQoS=0x00 deploy@alpha.mintel.me " + ssh -i ~/.ssh/id_ed25519 \ + -o StrictHostKeyChecking=no \ + -o ServerAliveInterval=60 \ + -o ServerAliveCountMax=5 \ + -o TCPKeepAlive=yes \ + -o IPQoS=0x00 deploy@alpha.mintel.me " set -e - echo '=== Logging in to registry on server ===' + echo 'Logging in to registry...' echo \"\$REGISTRY_PASS\" | docker login registry.infra.mintel.me -u \"\$REGISTRY_USER\" --password-stdin - echo 'Registry login successful' - cd /home/deploy/sites/mb-grid-solutions.com || { echo 'Directory not found!'; exit 1; } + cd /home/deploy/sites/klz-cables.com || { echo 'Directory not found!'; exit 1; } - echo '' - echo '=== Current status before deploy ===' - docker compose ps -a || true + echo 'Creating .env...' + echo 'SENTRY_DSN=${{ secrets.SENTRY_DSN }}' > .env - echo '' - echo '=== Current local image ===' - docker images registry.infra.mintel.me/mintel/mb-grid-solutions:latest --format 'table {{.Repository}}:{{.Tag}}\t{{.ID}}\t{{.CreatedSince}}' || echo 'No image found' + echo 'Pulling latest image...' + docker compose pull app - echo '' - echo '=== Pulling latest image (force) ===' - docker compose pull app || { echo 'Pull failed!'; exit 1; } + echo 'Force recreating app...' + docker compose up -d --force-recreate app - echo '' - echo '=== Stopping and removing old containers ===' - docker compose down app --remove-orphans || true - docker compose rm -f app || true + echo 'Pruning old images...' + docker image prune -f --filter 'until=24h' - echo '' - echo '=== Starting services with force-recreate and no-build ===' - docker compose up -d --pull always --force-recreate --no-build --no-deps app - - echo '' - echo '=== Waiting for containers to become healthy (max 30s) ===' - for i in {1..6}; do - echo \"Attempt \$i/6...\" - if docker compose ps --format '{{.Status}}' | grep -q 'healthy'; then - echo 'All containers healthy!' - break - fi - sleep 5 - done - - echo '' - echo '=== Final status ===' - docker compose ps -a - - echo '' - echo '=== Image now in use ===' - docker compose ps --format '{{.Name}}\t{{.Image}}\t{{.Status}}' - - echo '' - echo '=== Last 40 lines of logs ===' - docker compose logs --tail=40 app || true - - echo '' - echo '=== Pruning dangling & old images (keep last 24h) ===' - docker image prune -f --filter 'until=24h' || true - - echo '' - echo '=== Deployment completed ===' - " - echo "Deployment process finished" \ No newline at end of file + echo 'Deployment finished. Status:' + docker compose ps app + docker compose logs --tail=20 app + " \ No newline at end of file