diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index e363232..7bf27e1 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -14,6 +14,10 @@ jobs: - name: Fetch all history for git diff run: git fetch --depth=2 + - name: Install jq + run: | + apt-get update && apt-get install -y jq + - name: Detect modified folders id: detect-changes run: | @@ -85,10 +89,13 @@ jobs: sleep 45 # Delay for 45 seconds before fetching logs - job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" "https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id" | grep -oP '"id":\s*\K[0-9]+') - logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" "https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json") - + job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id') + logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json) echo "AWX Job Logs for folder: $folder" + echo "Range:" + echo "Start: $(echo "$logs" | jq -r '.range.start')" + echo "End: $(echo "$logs" | jq -r '.range.end')" + echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')" echo "Content:" - echo "$logs" | grep -oP '"content":\s*"\K[^"]+' | sed 's/\\n/\n/g' + echo "$(echo "$logs" | jq -r '.content')" done diff --git a/docker/AI/docker-compose.yml b/docker/AI/docker-compose.yml index c925ce4..ed0ede0 100644 --- a/docker/AI/docker-compose.yml +++ b/docker/AI/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: ollama: - image: docker.mafyuh.xyz/ollama/ollama:0.2.6 + image: ollama/ollama:0.3.1 container_name: ollama restart: unless-stopped volumes: @@ -29,7 +29,7 @@ services: - host.docker.internal:host-gateway mindsdb: - image: docker.mafyuh.xyz/mindsdb/mindsdb:v24.7.3.0 + image: mindsdb/mindsdb:v24.7.3.0 container_name: mindsdb ports: - 47334:47334 diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 591cbee..cd6df36 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -1,7 +1,7 @@ --- services: server: - image: codeberg.org/forgejo/forgejo:7.0.5 + image: codeberg.org/forgejo/forgejo:8.0.0 container_name: forgejo environment: - USER_UID=1000 diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index a2dc69d..7b578c6 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -1,7 +1,7 @@ --- services: bazarr: - image: ghcr.io/linuxserver/bazarr@sha256:25f0d19ba9226fdf15aec0fc7fa134ba89fc6f77f09d7bd45b33c5960c47821e + image: ghcr.io/linuxserver/bazarr@sha256:e70de8a714ac57395d45052392001ec433b8f48aa1c204f13dae312cbcbe43af container_name: bazarr ports: - "6767:6767" diff --git a/docker/jellyfin/docker-compose.yml b/docker/jellyfin/docker-compose.yml index 9cbaceb..737a23c 100644 --- a/docker/jellyfin/docker-compose.yml +++ b/docker/jellyfin/docker-compose.yml @@ -1,7 +1,7 @@ --- services: jellyfin: - image: ghcr.io/linuxserver/jellyfin@sha256:843878f35dc700e502798b39edb24b84b7b7ff0788f1b7b9b1e71d4f8d34f951 + image: ghcr.io/linuxserver/jellyfin@sha256:eadf16cadd823a5cbe1b92750ee74111f9b2cac894834477ab4a43a5fc835ebe container_name: jellyfin devices: - /dev/dri/renderD129:/dev/dri/renderD129