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
@@ -287,11 +301,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 != '' }}
         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 }}

README.md

@@ -16,9 +16,6 @@
 | bitwarden | vaultwarden/server:latest |
 | bluesky-pds | ghcr.io/bluesky-social/pds:latest |
 | browserless | ghcr.io/browserless/chromium:latest |
-| bunkerweb | bunkerity/bunkerweb:latest |
-| bunkerweb-scheduler | bunkerity/bunkerweb-scheduler:latest |
-| bunkerweb-ui | bunkerity/bunkerweb-ui:latest |
 | castopod | castopod/castopod:latest |
 | cloudflared | cloudflare/cloudflared:latest |
 | cloudflareddns | ghcr.io/hotio/cloudflareddns:latest |
@@ -95,7 +92,7 @@
 | netbird-coturn | coturn/coturn:latest |
 | netbox | lscr.io/linuxserver/netbox:latest |
 | netbox-db | postgres:17-alpine |
-| nextcloud | lscr.io/linuxserver/nextcloud:latest |
+| nextcloud | nextcloud/all-in-one:latest |
 | ollama | ollama/ollama |
 | ombi | lscr.io/linuxserver/ombi:latest |
 | paperless-ngx | ghcr.io/paperless-ngx/paperless-ngx:latest |
@@ -147,10 +144,10 @@
 | wallabag | wallabag/wallabag |
 | wallos | bellamy/wallos:latest |
 | watchtower | ghcr.io/containrrr/watchtower:latest |
-| wazuh.agent | opennix/wazuh-agent:latest |
-| wazuh.dashboard | wazuh/wazuh-dashboard: |
-| wazuh.indexer | wazuh/wazuh-indexer: |
-| wazuh.manager | wazuh/wazuh-manager: |
+| wazuh-agent | kennyopennix/wazuh-agent:latest |
+| wazuh-dashboard | wazuh/wazuh-dashboard: |
+| wazuh-indexer | wazuh/wazuh-indexer: |
+| wazuh-manager | wazuh/wazuh-manager: |
 | web-check | lissy93/web-check |
 | your_spotify | lscr.io/linuxserver/your_spotify:latest |
 | youtubedl | nbr23/youtube-dl-server:latest |

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

@@ -10,6 +10,8 @@ networks:
     name: compose_bitmagnet
   default:
     name: compose_default
+  nextcloud-aio:
+    external: true
 services:
   actual_server:
     container_name: actualbudget
@@ -520,63 +522,6 @@ services:
     networks:
       default: null
     restart: unless-stopped
-  bunkerweb:
-    container_name: bunkerweb
-    environment:
-      API_WHITELIST_IP: 172.18.0.0/16 192.168.1.0/24
-      REAL_IP_FROM: 172.18.0.0/16
-      REAL_IP_HEADER: X-Forwarded-For
-      REVERSE_PROXY_HOST: http://swag:80
-      SERVER_NAME: bunker.trez.wtf
-      USE_REAL_IP: yes
-      USE_REVERSE_PROXY: yes
-    expose:
-      - 8080
-      - 8443
-    image: bunkerity/bunkerweb:latest
-    labels:
-      bunkerweb.INSTANCE: yes
-    restart: unless-stopped
-  bunkerweb-scheduler:
-    container_name: bunkerweb-scheduler
-    depends_on:
-      - bunkerweb
-      - docker-socket-proxy
-    environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-    image: bunkerity/bunkerweb-scheduler:latest
-    restart: unless-stopped
-    volumes:
-      - bunkerweb-data:/data
-  bunkerweb-ui:
-    container_name: bunkerweb-ui
-    depends_on:
-      bunkerweb:
-        condition: service_started
-        required: true
-        restart: true
-      docker-socket-proxy:
-        condition: service_started
-        required: true
-    environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-    expose:
-      - 7000
-    image: bunkerity/bunkerweb-ui:latest
-    labels:
-      homepage.group: Privacy/Security
-      homepage.name: Bunker Web
-      homepage.href: https://bunker.${MY_TLD}
-      homepage.icon: bunkerweb.svg
-      homepage.description: Next-gen WAF
-      swag: enable
-      swag_port: 7000
-      swag_url: bunker.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://bunker.${MY_TLD}
-    restart: unless-stopped
-    volumes:
-      - bunkerweb-data:/data
   castopod:
     container_name: castopod
     depends_on:
@@ -1901,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}
@@ -1994,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
@@ -2058,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
@@ -2091,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:
@@ -2134,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}
@@ -3253,7 +3206,6 @@ services:
       PGID: 1000
       PUID: 1000
       TZ: America/New_York
-      MYSQL_PASSWORD: ${NEXTCLOUD_MARIADB_PASSWORD}
     hostname: Rinoa
     image: linuxserver/mariadb
     networks:
@@ -3717,12 +3669,10 @@ services:
         type: volume
         volume: {}
   nextcloud:
-    container_name: nextcloud
+    container_name: nextcloud-aio-mastercontainer
     environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-      LOG_LEVEL: debug
       SKIP_DOMAIN_VALIDATION: false
-      APACHE_ADDITIONAL_NETWORK: 
+      APACHE_ADDITIONAL_NETWORK: compose_default
       APACHE_IP_BINDING: 0.0.0.0
       APACHE_PORT: 11000
     expose:
@@ -3736,7 +3686,8 @@ services:
       homepage.description: Private Cloud
       swag: enable
       swag_port: 11000
-      swag_proto: https
+      swag_proto: http
+      swag_address: nextcloud-aio-apache
       swag_url: cloud.${MY_TLD}
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://cloud.${MY_TLD}
@@ -3744,9 +3695,8 @@ services:
       - 56713:8080
     restart: unless-stopped
     volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - ${DOCKER_VOLUME_CONFIG}/nextcloud/config:/config
-      - ${DOCKER_VOLUME_CONFIG}/nextcloud/data:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+      - nextcloud_aio_mastercontainer:/mnt/docker-aio-config
   ollama:
     container_name: ollama
     image: ollama/ollama
@@ -4863,7 +4813,7 @@ services:
       homepage.group: Servarr Stack
       homepage.name: Sonashow
       homepage.href: https://sonashow.${MY_TLD}
-      homepage.icon: /icons/sonashow.png
+      homepage.icon: sh-sonashow.png
       homepage.description: TV show discovery based on library/tastes
       swag: enable
       swag_auth: authelia
@@ -5059,7 +5009,8 @@ services:
       homepage.widget.type: swagdashboard
       homepage.widget.url: http://swag:81
     networks:
-      default: null
+      - default
+      - nextcloud-aio
     ports:
       - mode: ingress
         protocol: tcp
@@ -6678,7 +6629,7 @@ services:
         source: /var/run/docker.sock
         target: /var/run/docker.sock
         type: bind
-  wazuh.agent:
+  wazuh-agent:
     container_name: wazuh.agent
     environment:
       JOIN_MANAGER_PROTOCOL: https
@@ -6691,17 +6642,17 @@ services:
       VIRUS_TOTAL_KEY: ${VIRUS_TOTAL_API_KEY}
       DOCKER_HOST: tcp://dockerproxy:2375
     hostname: wazuh.agent
-    image: opennix/wazuh-agent:latest
+    image: kennyopennix/wazuh-agent:latest
     networks:
       default: null
     restart: unless-stopped
-  wazuh.dashboard:
-    container_name: wazuh.dashboard
+  wazuh-dashboard:
+    container_name: wazuh-dashboard
     depends_on:
-      wazuh.indexer:
+      wazuh-indexer:
         condition: service_started
         required: true
-      wazuh.manager:
+      wazuh-manager:
         condition: service_started
         required: true
         restart: true
@@ -6713,7 +6664,7 @@ services:
       DASHBOARD_PASSWORD: ${WAZUH_KIBANA_PASSWORD}
       API_USERNAME: wazuh-wui
       API_PASSWORD: ${WAZUH_API_PASSWORD}
-    hostname: wazuh.dashboard
+    hostname: wazuh-dashboard
     image: wazuh/wazuh-dashboard:${WAZUH_VERSION}
     labels:
       swag: enable
@@ -6728,8 +6679,8 @@ services:
       homepage.icon: wazuh.svg
       homepage.description: OSS Security Platform for XDR/SIEM
     links:
-      - wazuh.indexer:wazuh.indexer
-      - wazuh.manager:wazuh.manager
+      - wazuh-indexer:wazuh-indexer
+      - wazuh-manager:wazuh-manager
     networks:
       default: null
     ports:
@@ -6739,27 +6690,27 @@ services:
         target: 5601
     restart: always
     volumes:
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/certs/wazuh.dashboard.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.dashboard.pem
         target: /usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/certs/wazuh.dashboard-key.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.dashboard-key.pem
         target: /usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/certs/root-ca.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/root-ca.pem
         target: /usr/share/wazuh-dashboard/certs/root-ca.pem
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/config/opensearch_dashboards.yml
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/opensearch_dashboards.yml
         target: /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/config/wazuh.yml
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/wazuh.yml
         target: /usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
         type: bind
         bind:
@@ -6772,11 +6723,11 @@ services:
         target: /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
         type: volume
         volume: {}
-  wazuh.indexer:
-    container_name: wazuh.indexer
+  wazuh-indexer:
+    container_name: wazuh-indexer
     environment:
       OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
-    hostname: wazuh.indexer
+    hostname: wazuh-indexer
     image: wazuh/wazuh-indexer:${WAZUH_VERSION}
     networks:
       default: null
@@ -6798,43 +6749,43 @@ services:
         target: /var/lib/wazuh-indexer
         type: volume
         volume: {}
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/root-ca.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/root-ca.pem
         target: /usr/share/wazuh-indexer/certs/root-ca.pem
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/wazuh.indexer-key.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.indexer-key.pem
         target: /usr/share/wazuh-indexer/certs/wazuh.indexer.key
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/wazuh.indexer.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.indexer.pem
         target: /usr/share/wazuh-indexer/certs/wazuh.indexer.pem
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/admin.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/admin.pem
         target: /usr/share/wazuh-indexer/certs/admin.pem
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/admin-key.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/admin-key.pem
         target: /usr/share/wazuh-indexer/certs/admin-key.pem
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/config/wazuh.indexer.yml
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/wazuh.indexer.yml
         target: /usr/share/wazuh-indexer/opensearch.yml
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/config/internal_users.yml
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/internal_users.yml
         target: /usr/share/wazuh-indexer/opensearch-security/internal_users.yml
         type: bind
         bind:
           create_host_path: true
-  wazuh.manager:
-    container_name: wazuh.manager
+  wazuh-manager:
+    container_name: wazuh-manager
     environment:
       INDEXER_URL: https://wazuh.indexer:9200
       INDEXER_USERNAME: admin
@@ -6845,7 +6796,7 @@ services:
       SSL_KEY: /etc/ssl/filebeat.key
       API_USERNAME: wazuh-wui
       API_PASSWORD: ${WAZUH_API_PASSWORD}
-    hostname: wazuh.manager
+    hostname: wazuh-manager
     image: wazuh/wazuh-manager:${WAZUH_VERSION}
     networks:
       default: null
@@ -6919,22 +6870,22 @@ services:
         target: /var/lib/filebeat
         type: volume
         volume: {}
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/certs/root-ca.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/root-ca.pem
         target: /etc/ssl/root-ca.pem
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/certs/wazuh.manager.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.manager.pem
         target: /etc/ssl/filebeat.pem
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/certs/wazuh.manager-key.pem
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.manager-key.pem
         target: /etc/ssl/filebeat.key
         type: bind
         bind:
           create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/config/wazuh_manager.conf
+      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/wazuh_manager.conf
         target: /wazuh-config-mount/etc/ossec.conf
         type: bind
         bind:
@@ -7522,6 +7473,8 @@ volumes:
     name: netbird-letsencrypt
   netbox-pg-db:
     name: netbox-pg-db
+  nextcloud_aio_mastercontainer:
+    name: nextcloud_aio_mastercontainer
   ollama:
     name: ollama
   paperless-ngx-data: