Merge pull request 'Removing Netbox and Slurpit.' (#1) from netbox-removal-pipeline-tweak into main

Reviewed-on: Trez.One/rinoa-docker#1

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

@@ -192,20 +192,20 @@ jobs:
         uses: actions/checkout@v4
       - name: Install yq
         uses: dcarbone/install-yq-action@v1
-      - name: Fetch main branch for comparison
+      # - name: Fetch main branch for comparison
-        run: |
+      #   run: |
-          git fetch origin main:main
+      #     git fetch origin main:main
-      - name: Compare services using yq
+      # - name: Compare services using yq
-        continue-on-error: true
+      #   continue-on-error: true
-        id: compare-services
+      #   id: compare-services
-        run: |
+      #   run: |
-          current_services=$(yq '.services | to_entries' docker-compose.yml)
+      #     current_services=$(yq '.services | to_entries' docker-compose.yml)
-          git show main:docker-compose.yml > main_compose.yml
+      #     git show main:docker-compose.yml > main_compose.yml
-          main_services=$(yq '.services | to_entries' 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_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'}
+      #     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"
-          echo "modified_services=$modified_services" >> $GITHUB_OUTPUT
+      #     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

docker-compose.yml

@@ -3504,69 +3504,6 @@ services:
     #      - ${DOCKER_VOLUME_CONFIG}/netbird/privkey.pem:/etc/coturn/private/privkey.pem:ro
     #      - ${DOCKER_VOLUME_CONFIG}/netbird/cert.pem:/etc/coturn/certs/cert.pem:ro
     network_mode: host
-  netbox:
-    container_name: netbox
-    depends_on:
-      netbox-db:
-        condition: service_healthy
-        required: true
-      redis:
-        condition: service_started
-        required: true
-    environment:
-      PUID: ${PUID}
-      PGID: ${PGID}
-      TZ: ${TZ}
-      SUPERUSER_EMAIL: charish.patel@pm.me
-      SUPERUSER_PASSWORD: ${NETBOX_SUPERUSER_PASSWORD}
-      ALLOWED_HOST: net.trez.wtf
-      DB_NAME: netbox
-      DB_USER: netbox
-      DB_PASSWORD: ${NETBOX_PG_DB_PASSWORD}
-      DB_HOST: netbox-db
-      DB_PORT: 5432
-      DEBUG: false
-      DOCKER_MODS: linuxserver/mods:netbox-slurpit
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
-      REMOTE_AUTH_ENABLED:
-    image: lscr.io/linuxserver/netbox:latest
-    labels:
-      homepage.group: Infrastructure/App Performance Monitoring
-      homepage.name: Netbox
-      homepage.href: https://net.${MY_TLD}
-      homepage.icon: netbox.svg
-      homepage.description: Network modeling/documentation
-      swag: enable
-      swag_url: net.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://net.${MY_TLD}
-    ports:
-      - 8007:8000
-    restart: unless-stopped
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/netbox/:/config
-  netbox-db:
-    container_name: netbox-db
-    environment:
-      POSTGRES_USER: netbox
-      POSTGRES_PASSWORD: ${NETBOX_PG_DB_PASSWORD}
-      POSTGRES_DB: netbox
-    expose:
-      - 5432
-    healthcheck:
-      test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER
-      start_period: 20s
-      timeout: 30s
-      interval: 10s
-      retries: 5
-    image: postgres:17-alpine
-    restart: always
-    volumes:
-      - source: netbox-pg-db
-        target: /var/lib/postgresql/data
-        type: volume
-        volume: {}
   netdata:
     cap_add:
       - SYS_PTRACE
@@ -4577,83 +4514,6 @@ services:
         type: bind
         bind:
           create_host_path: true
-  slurpit-portal:
-    container_name: slurpit-portal
-    environment:
-      TZ: ${TZ}
-      PORTAL_BASE_URL: https://slurpit.trez.wtf
-      PORTAL_WAREHOUSE_URL: http://slurpit-warehouse
-    image: slurpit/portal:latest
-    labels:
-      homepage.group: Infrastructure/App Performance Monitoring
-      homepage.name: Slurp'it
-      homepage.href: https://slurpit.${MY_TLD}
-      homepage.icon: /icons/slurpit.png
-      homepage.description: Network discovery
-      swag: enable
-      swag_port: 80
-      swag_url: slurpit.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://slurpit.${MY_TLD}
-    ports:
-      - 8110:80
-      - 5443:443
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/nginx:/var/log/nginx/
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/mysql:/var/log/mysql/
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/php:/var/log/php/
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/certs:/etc/nginx/certs/
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/db/portal:/var/lib/mysql
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/backup/portal:/backup/files
-  slurpit-scanner:
-    container_name: slurpit-scanner
-    depends_on:
-      slurpit-warehouse:
-        condition: service_healthy
-    environment:
-      TZ: ${TZ}
-      SCANNER_POOLSIZE: 4
-      SCANNER_TIMEOUT: 10
-      SCANNER_WAREHOUSE_URL: http://slurpit-warehouse
-    image: slurpit/scanner:latest
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/scanner:/logs
-  slurpit-scraper:
-    container_name: slurpit-scraper
-    depends_on:
-      slurpit-warehouse:
-        condition: service_healthy
-    image: slurpit/scraper:latest
-    environment:
-      TZ: ${TZ}
-      SCRAPER_TIMEOUT: 20
-      SCRAPER_POOLSIZE: 4
-      SCRAPER_WAREHOUSE_URL: http://slurpit-warehouse
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/scraper:/logs
-  slurpit-warehouse:
-    container_name: slurpit-warehouse
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/services"]
-      interval: 10s
-      timeout: 10s
-      retries: 360
-    image: slurpit/warehouse:latest
-    environment:
-      TZ: ${TZ}
-      WAREHOUSE_CALLBACK_SCANNER_URL: http://slurpit-portal/callback/scanner
-      WAREHOUSE_CALLBACK_SCANNER_TOKEN:
-      WAREHOUSE_CALLBACK_SCRAPER_URL: http://slurpit-portal/callback/scraper
-      WAREHOUSE_CALLBACK_SCRAPER_TOKEN:
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/backup/warehouse:/backup/files
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/db/warehouse:/var/lib/mongodb
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/warehouse/mongodb:/var/log/mongodb
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/warehouse:/logs
   sonarqube:
     container_name: sonarqube
     depends_on: