From 0121845d016a02a9e360bd44fccbb01289b77af8 Mon Sep 17 00:00:00 2001
From: Matthew Pomes <matthew.pomes@pm.me>
Date: Tue, 30 Jun 2026 21:54:48 -0500
Subject: [PATCH] Cleanup a few unused containers

---
 docker-compose.yaml | 117 +++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 67 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index b707eaa..8128248 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,6 +3,7 @@ include:
   - ./jellyfin-compose.yaml
   - ./immich-compose.yaml
   - ./matrix-compose.yaml
+  - ./authentik.yaml
 secrets:
   JWT_SECRET:
     file: '/data/authelia/secrets/JWT_SECRET'
@@ -94,7 +95,9 @@ services:
       - gitea
       - gpodder
       - memos
+      - authentik
       - matrix-server
+      - jackett
     logging: &logging
       options:
         max-size: "50m"
@@ -122,44 +125,52 @@ services:
       - './authelia/:/config:ro'
       - '/data/authelia/:/data'
     logging: *logging
-  minecraft:
-    image: itzg/minecraft-server:latest
-    tty: true
-    stdin_open: true
-    restart: unless-stopped
-    ports:
-      - "25565:25565"
-      - "24454:24454/udp"
-    environment:
-      EULA: "TRUE"
-      TYPE: "FABRIC"
-      MEMORY: "4G"
-      MOTD: "Loading server..."
-      # VERSION: "1.21.11"
-      VERSION: "26.1.1"
-      # LEVEL: "world"
-      LEVEL: "house"
-      SEED: "881949285698121329"
-      # USE_MEOWICE_FLAGS: "true"
-      DIFFICULTY: "normal"
-      MODE: "survival"
-      OPS: |-
-        187eca31-2e33-4199-97e0-2286bf35f7f8
-      ENABLE_WHITELIST: "true"
-      WHITELIST: |-
-        187eca31-2e33-4199-97e0-2286bf35f7f8,
-        5d341a01-506c-4473-a530-1ae9188c03c7,
-        34586a37-772e-4da4-86a1-6704f286d4c6,
-        1ff2724b-168f-4b17-8cf2-850894b34ead
-      PAUSE_WHEN_EMPTY_SECONDS: "20"
-      ENABLE_ROLLING_LOGS: "true"
-      REMOVE_OLD_MODS: "TRUE"
-    logging: *logging
-    volumes:
-      - "/data/minecraft/data:/data"
-      - "/data/minecraft/mods:/mods"
-      - "/data/minecraft/plugins:/plugins"
-      - "/data/minecraft/config:/config"
+  # minecraft:
+  #   image: itzg/minecraft-server:latest
+  #   tty: true
+  #   stdin_open: true
+  #   restart: unless-stopped
+  #   ports:
+  #     - "25565:25565"
+  #     - "24454:24454/udp"
+  #   environment:
+  #     EULA: "TRUE"
+  #     TYPE: "FABRIC"
+  #     MEMORY: "16G"
+  #     PAUSE_WHEN_EMPTY_SECONDS: "20"
+  #     USE_MEOWICE_FLAGS: "true"
+  #     USE_MEOWICE_GRAALVM_FLAGS: "true"
+  #     # JVM_OPS: "--add-modules=jdk.incubator.vector -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true -XX:G1NewSizePercent=40 -XX:G1MaxNewSizePercent=50 -XX:G1HeapRegionSize=16M -XX:G1ReservePercent=15"
+  #     SYNC_CHUNK_WRITES: "false"
+  #     SPAWN_PROTECTION: "false"
+  #     ENABLE_ROLLING_LOGS: "true"
+  #     MOTD: "Loading server..."
+  #     # VERSION: "1.21.11"
+  #     VERSION: "26.1.1"
+  #     # LEVEL: "world"
+  #     LEVEL: "house"
+  #     SEED: "881949285698121329"
+  #     DIFFICULTY: "normal"
+  #     MODE: "survival"
+  #     OPS: |-
+  #       187eca31-2e33-4199-97e0-2286bf35f7f8
+  #     ENABLE_WHITELIST: "true"
+  #     WHITELIST: |-
+  #       187eca31-2e33-4199-97e0-2286bf35f7f8,
+  #       5d341a01-506c-4473-a530-1ae9188c03c7,
+  #       34586a37-772e-4da4-86a1-6704f286d4c6,
+  #       1ff2724b-168f-4b17-8cf2-850894b34ead
+  #     REMOVE_OLD_MODS: "TRUE"
+  #   logging: *logging
+  #   volumes:
+  #     # - "/data/minecraft/data:/data"
+  #     # - "/data/minecraft/mods:/mods"
+  #     # - "/data/minecraft/plugins:/plugins"
+  #     # - "/data/minecraft/config:/config"
+  #     - "/srv/minecraft/data:/data"
+  #     - "/srv/minecraft/mods:/mods"
+  #     - "/srv/minecraft/plugins:/plugins"
+  #     - "/srv/minecraft/config:/config"
   gitea:
     image: docker.gitea.com/gitea:1.24
     environment:
@@ -239,41 +250,13 @@ services:
       - POSTFIX_mydestination=loadingm.xyz,loading-hpdl380g10.loadingm.xyz
       - MASQUERADED_DOMAINS=loadingm.xyz,loading-hpdl380g10.loadingm.xyz
       - SMTPD_SASL_USERS="a:123,b:123"
+      - "POSTFIX_mynetworks=0.0.0.0/0,[::0]/0"
     volumes:
       - /data/mail:/etc/opendkim/keys
     networks:
       - mail
     ports:
       - 127.0.0.1:25:25
-  # mail:
-  #   image: ghcr.io/docker-mailserver/docker-mailserver:latest
-  #   container_name: mailserver
-  #   # Provide the FQDN of your mail server here (Your DNS MX record should point to this value)
-  #   hostname: mail.loadingm.xyz
-  #   env_file: mailserver.env
-  #   # More information about the mail-server ports:
-  #   # https://docker-mailserver.github.io/docker-mailserver/latest/config/security/understanding-the-ports/
-  #   ports:
-  #     - "25:25"    # SMTP  (explicit TLS => STARTTLS, Authentication is DISABLED => use port 465/587 instead)
-  #     - "143:143"  # IMAP4 (explicit TLS => STARTTLS)
-  #     - "465:465"  # ESMTP (implicit TLS)
-  #     - "587:587"  # ESMTP (explicit TLS => STARTTLS)
-  #     - "993:993"  # IMAP4 (implicit TLS)
-  #   volumes:
-  #     - /data/dms/mail-data/:/var/mail/
-  #     - /data/dms/mail-state/:/var/mail-state/
-  #     - /data/dms/mail-logs/:/var/log/mail/
-  #     - /data/dms/config/:/tmp/docker-mailserver/
-  #     - /etc/localtime:/etc/localtime:ro
-  #   restart: always
-  #   stop_grace_period: 1m
-  #   # Uncomment if using `ENABLE_FAIL2BAN=1`:
-  #   # cap_add:
-  #   #   - NET_ADMIN
-  #   healthcheck:
-  #     test: "ss --listening --ipv4 --tcp | grep --silent ':smtp' || exit 1"
-  #     timeout: 3s
-  #     retries: 0
   bitwarden:
     # env_file:
     #   - bitwarden.env