Removing service comparison for now.

Merged by Trez.One

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

@@ -186,11 +186,25 @@ jobs:
     needs: [cloudflare-dns-setup]
     outputs:
       pr-pushed: ${{ steps.commit-readme.outputs.pushed }}
+      modified_services: ${{ steps.compare-services.outputs.modified_services }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install yq
         uses: dcarbone/install-yq-action@v1
+      # - name: Fetch main branch for comparison
+      #   run: |
+      #     git fetch origin main:main
+      # - name: Compare services using yq
+      #   id: compare-services
+      #   run: |
+      #     current_services=$(yq '.services | to_entries' docker-compose.yml)
+      #     git show main:docker-compose.yml > main_compose.yml
+      #     main_services=$(yq '.services | to_entries' main_compose.yml)
+      #     modified_services_file=$(comm -13 <(echo "$main_services") <(echo "$current_services") > changes_compose.yml)
+      #     modified_services=${egrep '^  [a-z]' changes.yml | sed -e 's|^  ||g' -e 's|:||g' | sed ':a;N;$!ba;s/\n/ /g'}
+      #     echo "Modified services: $modified_services"
+      #     echo "modified_services=$modified_services" >> $GITHUB_OUTPUT
       - name: Generate service list
         run: |
           yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml > services.yml
@@ -286,25 +300,13 @@ jobs:
       - name: Generate .env file for deployment
         run: |
            vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
-      - name: Detect modified services
-        id: detect-modified-services
-        run: |
-          git diff --name-only HEAD^ HEAD | grep docker-compose.yml > /dev/null
-          if [ $? -eq 0 ]; then
-            modified_services=$(git diff HEAD^ HEAD -- docker-compose.yml | grep -E '^\+[[:space:]]+[a-zA-Z0-9_-]+:' | sed -E 's/^\+[[:space:]]+([a-zA-Z0-9_-]+):.*/\1/')
-            echo "Modified services: $modified_services"
-            echo "modified_services=$modified_services" >> $GITHUB_OUTPUT
-          else
-            echo "No changes in docker-compose.yml"
-            echo "modified_services=" >> $GITHUB_OUTPUT
-          fi
       - name: Docker Compose Deployment
         if: ${{ steps.detect-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
+          docker_args: -d --remove-orphans --pull missing  --parallel -1 ${{ steps.detect-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 }}

changes.yml

@@ -0,0 +1,47 @@
+    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

docker-compose.yml

@@ -1846,11 +1846,11 @@ services:
       DB_USERNAME: hortusfox
     image: ghcr.io/danielbrendel/hortusfox-web:latest
     labels:
-      homepage: enable
-      homepage_proto: http
-      homepage_url: plants.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
-      homepage.uptime-kuma.monitor.url: https://plants.${MY_TLD}
+      swag: enable
+      swag_proto: http
+      swag_url: plants.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://plants.${MY_TLD}
       homepage.group: Lifestyle
       homepage.name: HortusFox
       homepage.href: https://plants.${MY_TLD}
@@ -1939,6 +1939,26 @@ services:
     healthcheck:
       disable: false
     image: ghcr.io/immich-app/immich-server:release
+    labels:
+      swag: enable
+      swag_proto: http
+      swag_port: 2283
+      swag_url: pics.${MY_TLD}
+      swag_server_custom_directive: >-
+        location /share {
+          proxy_pass http://immich-public-proxy:3000;
+          proxy_set_header Host $$host;
+          proxy_set_header X-Real-IP $$remote_addr;
+          proxy_set_header X-Forwarded-For $$proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $$scheme;
+        }
+      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
     ports:
       - 2283:2283
     restart: always
@@ -2003,18 +2023,6 @@ services:
       start_period: 10s
       timeout: 5s
     image: alangrainger/immich-public-proxy:latest
-    labels:
-      homepage: enable
-      homepage_proto: http
-      homepage_port: 3000
-      homepage_url: pics.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
-      homepage.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
@@ -2036,15 +2044,15 @@ services:
       DOCKER_INFLUXDB_INIT_BUCKET: rinoa
     image: influxdb:2-alpine
     labels:
-      homepage: enable
-      homepage_proto: http
-      homepage_port: 8086
-      homepage_url: influxdb.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
-      homepage.uptime-kuma.monitor.url: https://influxdb.${MY_TLD}
+      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://invid.${MY_TLD}
+      homepage.href: https://influxdb.${MY_TLD}
       homepage.icon: influxdb.svg
       homepage.description: Scalable datastore for metrics, events, and real-time analytics
     ports:
@@ -2079,12 +2087,12 @@ services:
       timeout: 5s
     image: quay.io/invidious/invidious:latest
     labels:
-      homepage: enable
-      homepage_proto: http
-      homepage_port: 3000
-      homepage_url: invid.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
-      homepage.uptime-kuma.monitor.url: https://invid.${MY_TLD}
+      swag: enable
+      swag_proto: http
+      swag_port: 3000
+      swag_url: invid.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://invid.${MY_TLD}
       homepage.group: Social
       homepage.name: Invidious
       homepage.href: https://invid.${MY_TLD}