Pipeline fixes.

Merged by Trez.One

.gitea/workflows/pr-cloudflare-docker-deploy.yml

@@ -33,6 +33,7 @@ jobs:
         continue-on-error: true
         run: |
           tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+          tea pr list --repo ${{ github.repository }} --state all
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
@@ -180,13 +181,13 @@ jobs:
           gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}'
           notification_title: 'GITEA: Cloudflare Setup @ Rinoa'
           notification_message: 'Cloudflare DNS setup completed successfully.'
-  regenerate-readme:
-    name: Update README
+  regenerate-readme-modified-services:
+    name: Update README & Generate List of Modified Services
     runs-on: ubuntu-latest
     needs: [cloudflare-dns-setup]
-    outputs:
-      pr-pushed: ${{ steps.commit-readme.outputs.pushed }}
-      modified_services: ${{ steps.compare-services.outputs.modified_services }}
+    # outputs:
+    #   pr-pushed: ${{ steps.commit-readme.outputs.pushed }}
+    #   modified_services: ${{ steps.compare-services.outputs.modified_services }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -196,6 +197,7 @@ jobs:
       #   run: |
       #     git fetch origin main:main
       # - name: Compare services using yq
+      #   continue-on-error: true
       #   id: compare-services
       #   run: |
       #     current_services=$(yq '.services | to_entries' docker-compose.yml)
@@ -226,7 +228,7 @@ jobs:
           add: "README.md"
   pr-merge:
     name: PR Merge
-    needs: [regenerate-readme]
+    needs: [regenerate-readme-modified-services]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -301,12 +303,12 @@ jobs:
         run: |
            vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
       - name: Docker Compose Deployment
-        if: ${{ steps.detect-modified-services.outputs.modified_services != '' }}
+        if: ${{ steps.regenerate-readme-modified-services.outputs.modified_services != '' }}
         continue-on-error: true
         uses: keatonLiu/docker-compose-remote-action@v1.2
         with:
           docker_compose_file: docker-compose.yml
-          docker_args: -d --remove-orphans --pull missing  --parallel -1 ${{ steps.detect-modified-services.outputs.modified_services }}
+          docker_args: -d --remove-orphans --pull missing --parallel -1 ${{ steps.regenerate-readme-modified-services.outputs.modified_services }}
           ssh_user: gitea-deploy
           ssh_host: 192.168.1.254
           ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}

ansible/app-configs/homepage_settings.yaml.j2

@@ -27,22 +27,22 @@ layout:
     # fiveColumns: true
   Infrastructure/App Performance Monitoring:
     style: row
-    columns: 4
+    columns: 3
+  Code/DevOps:
+    style: row
+    columns: 3
+  Social:
+    style: row
+    columns: 3
+  Lifestyle:
+    style: row
+    columns: 3
   Automation:
     style: columns
     row: 2
-  Code/DevOps:
-    style: columms
-    row: 2
   Privacy/Security:
     style: columns
     row: 5
-  Social:
-    style: columns
-    row: 4
-  Lifestyle:
-    style: row
-    columns: 4
   Personal Services:
     style: row
     columns: 4
@@ -57,4 +57,4 @@ layout:
     columns: 3
   Media Library:
     style: row
-    columns: 4
+    columns: 3

changes.yml

@@ -1,47 +0,0 @@
-    ports:
-      - 2283:2283
-    restart: always
-    labels:
-      swag_port: 3000
-      swag_url: pics.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://pics.${MY_TLD}
-      homepage.group: Lifestyle
-      homepage.name: Immich
-      homepage.href: https://pics.${MY_TLD}
-      homepage.icon: immich.svg
-      homepage.description: High performance self-hosted photo and video management solution
-    restart: always
-  immich-power-tools:
-    container_name: immich-power-tools
-    environment:
-      IMMICH_API_KEY: ${IMMICH_POWER_TOOLS_KEY}
-      IMMICH_URL: http://immich-server:2283
-      EXTERNAL_IMMICH_URL: https://pics.trez.wtf
-    image: ghcr.io/varun-raj/immich-power-tools:latest
-    ports:
-      - 54018:3000
-  influxdb2:
-    container_name: influxdb2
-    environment:
-      DOCKER_INFLUXDB_INIT_MODE: setup
-      DOCKER_INFLUXDB_INIT_USERNAME: admin
-      DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB2_ADMIN_PASSWORD}
-      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: /run/secrets/influxdb2-admin-token
-      DOCKER_INFLUXDB_INIT_ORG: rinoa
-      DOCKER_INFLUXDB_INIT_BUCKET: rinoa
-    image: influxdb:2-alpine
-    labels:
-      swag: enable
-      swag_proto: http
-      swag_port: 8086
-      swag_url: influxdb.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://influxdb.${MY_TLD}
-      homepage.group: System Administration
-      homepage.name: InfluxDBv2
-      homepage.href: https://influxdb.${MY_TLD}
-      homepage.icon: influxdb.svg
-      homepage.description: Scalable datastore for metrics, events, and real-time analytics
-    ports:
-      - 8086:8086