diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml index 220b6b6..f22f81c 100644 --- a/.woodpecker/deploy.yml +++ b/.woodpecker/deploy.yml @@ -88,16 +88,16 @@ steps: when: - status: [failure] - - name: Trigger Portainer stack redeploy + - name: Trigger Dockhand stack redeploy image: curlimages/curl:latest environment: - PORTAINER_WEBHOOK_URL: - from_secret: portainer_webhook_url + WEBHOOK_URL: + from_secret: dockhand_webhook_url commands: - set -e - echo "=== Triggering Portainer stack redeploy ===" - | - resp=$(curl -s -w "\n%{http_code}" -X POST "$PORTAINER_WEBHOOK_URL") + resp=$(curl -s -w "\n%{http_code}" -X POST "$WEBHOOK_URL") body=$(echo "$resp" | head -n -1) code=$(echo "$resp" | tail -n 1) if [ "$code" != "200" ] && [ "$code" != "204" ]; then diff --git a/docker-compose.portainer.yml b/docker-compose.dockhand.yml similarity index 95% rename from docker-compose.portainer.yml rename to docker-compose.dockhand.yml index 8f7f0a7..6557428 100644 --- a/docker-compose.portainer.yml +++ b/docker-compose.dockhand.yml @@ -121,12 +121,12 @@ services: - /mnt/config/docker/qr/db:/data - /mnt/config/docker/qr/uploads:/uploads environment: - PORT: '8080' - DB_PATH: /data/db.sqlite - UPLOADS_PATH: /uploads + PORT: ${API_PORT:-8080} + DB_PATH: ${DB_PATH:-/data/db.sqlite} + UPLOADS_PATH: ${UPLOADS_PATH:-/uploads} KUTT_API_KEY: ${KUTT_API_KEY:-} - KUTT_BASE_URL: http://kutt:3000 - SHORT_DOMAIN: https://mifi.me + KUTT_BASE_URL: ${KUTT_BASE_URL:-http://kutt:3000} + SHORT_DOMAIN: ${SHORT_DOMAIN:-https://mifi.me} healthcheck: test: - CMD @@ -150,7 +150,7 @@ services: qr_api: condition: service_healthy environment: - QR_API_URL: http://qr_api:8080 + QR_API_URL: ${QR_API_URL:-http://qr_api:8080} healthcheck: test: - CMD