From 90e66ab8219b2f5aeabc402eba21d730ed517fb6 Mon Sep 17 00:00:00 2001
From: Marijn Doeve <marijn@doeve.me>
Date: Mon, 29 Dec 2025 10:53:05 +0100
Subject: [PATCH] Update 1.21.11

---
 .gitea/workflows/ci.yaml     | 44 -----------------------
 compose.yaml                 | 68 ++++++++++--------------------------
 containers/web/Containerfile |  8 -----
 3 files changed, 19 insertions(+), 101 deletions(-)
 delete mode 100644 .gitea/workflows/ci.yaml
 delete mode 100644 containers/web/Containerfile

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
deleted file mode 100644
index 37d9a89..0000000
--- a/.gitea/workflows/ci.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: release-tag
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  release-image:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/catthehacker/ubuntu:act-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.marijndoeve.nl
-          username: ${{ gitea.repository_owner }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: gitea.marijndoeve.nl/${{github.repository_owner}}/dynmap-web
-          tags: |
-            # set latest tag for default branch
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        env:
-          ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
-        with:
-          context: containers/web
-          file: containers/web/Containerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
diff --git a/compose.yaml b/compose.yaml
index f7655bf..2b97ae8 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -9,8 +9,6 @@ services:
       - "127.0.0.1:25564:25564"
     networks:
       - internal
-    depends_on:
-      - omb5
     environment:
       TZ: Europe/Amsterdam
       API_BINDING: ":25564"
@@ -20,20 +18,32 @@ services:
         10.0.0.21=omb5:25565
 
   omb5:
-    image: docker.io/itzg/minecraft-server:latest
+    image: docker.io/itzg/minecraft-server:stable
     container_name: mc-omb5
     restart: unless-stopped
     tty: true
     stdin_open: true
-    # depends_on:
-    #   - db
     ports:
       - "24454:24454/udp" # Voice mod
     volumes:
       - /srv/omb5/data:/data
-      - dynmap-data:/data/dynmap/web
     networks:
       - internal
+      - web
+    labels:
+      - traefik.enable=true
+      - traefik.http.services.omb5map.loadbalancer.server.port=8080
+      # omb5
+      - traefik.http.routers.ombweb.rule=Host(`omb5.marijndoeve.nl`)
+      - traefik.http.routers.ombweb.entrypoints=websecure
+      - traefik.http.routers.ombweb.tls.certresolver=marijndoeve
+      - traefik.http.routers.ombweb.service=omb5map
+      # harmitcraft
+      - traefik.http.routers.harmitcraftweb.rule=Host(`harmitcraft.nl`)
+      - traefik.http.routers.harmitcraftweb.entrypoints=websecure
+      - traefik.http.routers.harmitcraftweb.tls.certresolver=marijndoeve
+      - traefik.http.routers.harmitcraftweb.service=omb5map
+
     environment:
       # General
       USE_AIKAR_FLAGS: "true"
@@ -45,10 +55,11 @@ services:
       # Server
       TYPE: "FABRIC"
       EULA: "TRUE"
-      VERSION: "1.21.10"
+      VERSION: "1.21.11"
       MOTD: "Harmitcraft Season 5!"
       DIFFICULTY: hard
       SEED: "886232264"
+      SPAWN_PROTECTION: 0
 
       # Resource
       # RESOURCE_PACK
@@ -56,8 +67,6 @@ services:
       # Whitelist
       ENABLE_WHITELIST: "true"
 
-      ENABLE_AUTOPAUSE: true
-
       MAX_TICK_TIME: -1
 
       REMOVE_OLD_DATAPACKS: true
@@ -72,44 +81,9 @@ services:
         simple-voice-chat
         enhanced-groups:beta
         audioplayer:alpha
-      # dynmap:beta
+        squaremap
       MODRINTH_DOWNLOAD_DEPENDENCIES: required
 
-      SPAWN_PROTECTION: 0
-
-  # web:
-  #   image: gitea.marijndoeve.nl/harmitcraft/dynmap-web:latest
-  #   restart: unless-stopped
-  #   container_name: mc-web
-  #   volumes:
-  #     - dynmap-data:/var/www/html:ro
-  #   depends_on:
-  #     - db
-  #   networks:
-  #     - web
-  #     - internal
-  #   labels:
-  #     - traefik.enable=true
-  #     # omb5
-  #     - traefik.http.routers.ombweb.rule=Host(`omb5.marijndoeve.nl`)
-  #     - traefik.http.routers.ombweb.entrypoints=websecure
-  #     - traefik.http.routers.ombweb.tls.certresolver=marijndoeve
-  #     # harmitcraft
-  #     - traefik.http.routers.harmitcraftweb.rule=Host(`harmitcraft.nl`)
-  #     - traefik.http.routers.harmitcraftweb.entrypoints=websecure
-  #     - traefik.http.routers.harmitcraftweb.tls.certresolver=marijndoeve
-
-  # db:
-  #   image: postgres:18
-  #   container_name: mc-db
-  #   environment:
-  #     TZ: Europe/Amsterdam
-  #     POSTGRES_PASSWORD: thisissecret
-  #   volumes:
-  #     - db-data:/var/lib/postgresql/data
-  #   restart: unless-stopped
-  #   networks:
-  #     - internal
 
   monitor:
     image: itzg/mc-monitor
@@ -129,7 +103,3 @@ networks:
     external: false
   web:
     external: true
-
-volumes:
-  dynmap-data:
-  db-data:
diff --git a/containers/web/Containerfile b/containers/web/Containerfile
deleted file mode 100644
index 8f6f103..0000000
--- a/containers/web/Containerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM php:8.4-apache
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-    libpq-dev \
-    && docker-php-ext-install pdo_pgsql \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
\ No newline at end of file