Removing Librespeed, adding Speedtest-tracker.

Merged by Trez.One

README.md

@@ -102,6 +102,7 @@
 | redis | redis:alpine |
 | redlib | quay.io/redlib/redlib:latest |
 | rundeck | rundeck/rundeck:5.8.0 |
+| rundeck-pg-db | postgres:16-alpine |
 | sabnzbdvpn | ghcr.io/binhex/arch-sabnzbdvpn:latest |
 | scraperr | jpyles0524/scraperr:latest |
 | scraperr-api | jpyles0524/scraperr_api:latest |

docker-compose.yml

@@ -2685,57 +2685,6 @@ services:
         published: "22300"
         target: 22300
     restart: unless-stopped
-  librespeed:
-    container_name: librespeed
-    environment:
-      DB_HOSTNAME: 
-      DB_NAME: 
-      DB_PASSWORD: 
-      DB_TYPE: sqlite
-      DB_USERNAME: 
-      PASSWORD: 
-      PGID: 1000
-      PUID: 1000
-      TZ: America/New_York
-      DOCKER_MODS: ghcr.io/themepark-dev/theme.park:librespeed
-    hostname: Rinoa
-    image: lscr.io/linuxserver/librespeed:latest
-    labels:
-      homepage.group: System Administration
-      homepage.name: LibreSpeed
-      homepage.href: https://speed.${MY_TLD}
-      homepage.icon: librespeed.png
-      homepage.description: Speed test
-      homepage: enable
-      homepage_proto: http
-      homepage_url: speed.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
-      homepage.uptime-kuma.monitor.url: https://speed.${MY_TLD}
-    networks:
-      default: null
-    ports:
-      - mode: ingress
-        protocol: tcp
-        published: "8014"
-        target: 80
-    restart: unless-stopped
-    volumes:
-      - bind:
-          create_host_path: true
-        read_only: true
-        source: /etc/localtime
-        target: /etc/localtime
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/librespeed
-        target: /config
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /rinoa-storage
-        target: /storage
-        type: bind
   lidarr:
     container_name: lidarr
     environment:
@@ -3956,6 +3905,10 @@ services:
     user: nobody
   rundeck:
     container_name: rundeck
+    depends_on:
+      rundeck-pg-db:
+        condition: service_started
+        required: true
     image: rundeck/rundeck:5.8.0
     environment:
       RUNDECK_SERVER_ADDRESS: 0.0.0.0
@@ -3963,7 +3916,7 @@ services:
       RUNDECK_SERVER_FORWARDED: true
       RUNDECK_DATABASE_DRIVER: jdbc:postgresql://rundeck-pg-db/rundeck?autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true
       RUNDECK_DATABASE_USERNAME: rundeck
-      RUNDECK_DATABASE_PASSWORD: ${RUNDECK_POSTGRES_DB_PASSWD}
+      RUNDECK_DATABASE_PASSWORD: ${RUNDECK_PG_DB_PASSWD}
       RUNDECK_MAIL_SMTP_HOST: postal-smtp
       RUNDECK_MAIL_SMTP_PORT: 25
       RUNDECK_MAIL_SMTP_USERNAME: ${POSTAL_SMTP_AUTH_USER}
@@ -3986,13 +3939,14 @@ services:
     volumes:
       - rundeck-data:/home/rundeck/server/data
   rundeck-pg-db:
+    container_name: rundeck-pg-db
     image: postgres:16-alpine
     expose:
       - 5432
     environment:
       POSTGRES_DB: rundeck
       POSTGRES_USER: rundeck
-      POSTGRES_PASSWORD: ${RUNDECK_POSTGRES_DB_PASSWD}
+      POSTGRES_PASSWORD: ${RUNDECK_PG_DB_PASSWD}
     volumes:
       - rundeck-db-data:/var/lib/postgresql/data
   sabnzbdvpn:
@@ -4537,6 +4491,31 @@ services:
         type: bind
         bind:
           create_host_path: true
+  speedtest-tracker:
+    container_name: speedtest-tracker
+    image: lscr.io/linuxserver/speedtest-tracker:latest
+    environment:
+        PUID: ${PUID}
+        PGID: ${PGID}
+        APP_KEY: ${SPEEDTEST_TRACKER_APP_KEY}
+        DB_CONNECTION: sqlite
+    labels:
+      homepage.name: Speedtest Traccker
+      homepage.group: System Administration
+      homepage.description: Self-hosted internet performance tracking
+      homepage.href: https://speed.${MY_TLD}
+      homepage.icon: speedtest-tracker.png
+      swag: enable
+      swag_proto: http
+      swag_url: speed.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://slsk.${MY_TLD}
+    ports:
+        - 47512:80
+        - 62777:443
+    restart: unless-stopped
+    volumes:
+        - ${DOCKER_VOLUME_CONFIG}/speedtest-tracker:/config
   spotisub:
     container_name: spotisub
     environment: