change over to mariadb for mythdb, remove unused ark-server, remove ports exposed on mara that are not used anymore - did have to reconfigure grafana to use influxdb as the host instead of 192.168.0.2

docker-compose.yml

@@ -122,9 +122,6 @@ services:
       - TZ=Australia/Melbourne
       - PUID=500
       - PGID=500
-    ports:
-      - 18080:8080
-      - 18081:8081
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.enable=true"
@@ -148,7 +145,7 @@ services:
   emby:
     container_name: emby
 #    image:  emby/embyserver:latest
-    image: emby/embyserver:4.9.0.30
+    image: emby/embyserver:4.9.0.32
     restart: always
     network_mode: host
     environment:
@@ -181,7 +178,6 @@ services:
   # fail2ban might need a better whitelist? (I had internal docker ips in my quick fudge as well?)
   mail:
     image: docker.io/mailserver/docker-mailserver:14.0.0
-#    hostname: depaoli.id.au
     domainname: depaoli.id.au
     container_name: mail
     restart: always
@@ -192,7 +188,7 @@ services:
       - "993:993"
     labels:
       # somehow watchtower keeps restarting mail even without an update AND the mailserver emails me with updates anyway
-      - "com.centurylinklabs.watchtower.enable=false"
+      - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.enable=true"
       - "traefik.http.routers.mail.rule=Host(`rspamd.ddp.net`)"
       - "traefik.http.services.mail.loadbalancer.server.port=11334"
@@ -461,8 +457,6 @@ services:
   influxdb:
     image: influxdb:latest
     container_name: influxdb
-    ports:
-      - "8086:8086"
     environment:
       - DOCKER_INFLUXDB_INIT_MODE=setup
       - DOCKER_INFLUXDB_INIT_ORG=mara
@@ -553,7 +547,6 @@ services:
     ports:
       - "192.168.0.2:53:53/tcp"
       - "192.168.0.2:53:53/udp"
-      - "9999:80"
     environment:
       TZ: 'Australia/Melbourne'
       PIHOLE_DNS_: '208.67.222.222;208.67.220.220'
@@ -591,8 +584,6 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
       - "last.commit.url=https://api.github.com/repos/postgres/postgres/commits"
-    ports:
-      - '55432:5432'
     volumes:
       - /srv/docker/container/bookdb_dev/data:/var/lib/postgresql/data
       - /srv/docker/container/bookdb_dev/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
@@ -680,8 +671,6 @@ services:
       POSTGRES_DB: pa
     env_file:
         - /srv/docker/config/secrets/padb-common
-    ports:
-      - '65432:5432'
     depends_on:
       - pihole
     volumes:
@@ -818,6 +807,8 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - "ORG_EVENTS_ENABLED=true"
+    env_file:
+      - /srv/docker/config/secrets/vaultwarden
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.enable=true"
@@ -885,35 +876,6 @@ services:
     volumes:
       - "/etc/localtime:/etc/localtime:ro"
 
-#  ark-server:
-#    # for now ark-server wont start by default, needs manual startup
-#    restart: "no"
-#    image: hermsi/ark-server
-#    container_name: ark-server
-#    volumes:
-#      - /srv/docker/container/ark-server:/app
-#      - /srv/docker/container/ark-server-backups:/home/steam/ARK-Backups
-#    environment:
-#      - "SESSION_NAME=The Island - ARK"
-#      - "SERVER_MAP=TheIsland"
-#      - "SERVER_PASSWORD=bagrid"
-#      - "ADMIN_PASSWORD=arkadminpassword"
-#      - "MAX_PLAYERS=5"
-#      - "UPDATE_ON_START=false"
-#      - "BACKUP_ON_STOP=true"
-#      - "PRE_UPDATE_BACKUP=true"
-#      - "WARN_ON_STOP=true"
-#      - "GAME_MOD_IDS=1404697612,1428596566,772235118,895711211,731604991"
-#    ports:
-#      # Port for connections from ARK game client
-#      - "7777:7777/udp"
-#      # Raw UDP socket port (always Game client port +1)
-#      - "7778:7778/udp"
-#      # RCON management port
-#      - "27020:27020/tcp"
-#      # Steam's server-list port
-#      - "27015:27015/udp"
-
   kuma:
     image: louislam/uptime-kuma:latest
     container_name: kuma
@@ -926,8 +888,6 @@ services:
       - /srv/docker/container/kuma/monitoring-results:/monitoring-results
       - /etc/localtime:/etc/localtime:ro
     entrypoint: /root/mara-init/entrypoint-wrapper.sh
-    ports:
-      - 3001:3001  # leave these in case mon.depaoli.id.au is inaccessible
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.enable=true"
@@ -959,11 +919,11 @@ services:
 
   mythdb:
     container_name: mythdb
-    image: mysql:8.4
+    image: mariadb:latest
     restart: always
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
-      - "last.commit.url=https://api.github.com/repos/mysql/mysql-server/commits"
+      - "last.commit.url=https://api.github.com/repos/MariaDB/mariadb-docker/commits"
     environment:
       MYSQL_DATABASE: 'mythconverg'
       MYSQL_USER: 'mythtv'
@@ -975,10 +935,10 @@ services:
     ports:
         - "3306:3306"
     volumes:
-      - /srv/docker/container/mythtv/db/sql:/docker-entrypoint-initdb.d
+      - /srv/docker/container/mythtv/db_tst/sql:/docker-entrypoint-initdb.d
-      - /srv/docker/container/mythtv/db/data:/var/lib/mysql
+      - /srv/docker/container/mythtv/db_tst/data:/var/lib/mysql
-      - /srv/docker/container/mythtv/db/log:/var/log/mysql
+      - /srv/docker/container/mythtv/db_tst/log:/var/log/mysql
-      - /srv/docker/container/mythtv/db/mythtv.cnf:/etc/mysql/conf.d/mythtv.cnf
+      - /srv/docker/container/mythtv/db_tst/mythtv.cnf:/etc/mysql/mariadb.conf.d/mythtv.cnf
       - /etc/localtime:/etc/localtime:ro
 
   # hacked entrypoint to 'add' to this container so it works as mara needs