Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docker-compose.yml

docker-compose.yml

@@ -81,3 +81,48 @@ services:
       # More aggressive settings for demo purposes
       AUTOPAUSE_TIMEOUT_INIT: "30"
       AUTOPAUSE_TIMEOUT_EST: "10"
+
+  lazytainer:
+    image: ghcr.io/vmorganp/lazytainer:master
+    environment:
+      VERBOSE: false
+    ports:
+      - 25565:25565
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    labels:
+      - lazytainer.group.minecraft.sleepMethod=stop
+      - lazytainer.group.minecraft.ports=25565
+      - lazytainer.group.minecraft.minPacketThreshold=2 # Start after two incomming packets
+      - lazytainer.group.minecraft.inactiveTimeout=60 # 10 minutes, to allow the server to bootstrap. You can probably make this lower later if you want.
+    restart: unless-stopped
+    network_mode: bridge
+
+  minecraft:
+    image: 'itzg/minecraft-server'
+    restart: unless-stopped
+    stdin_open: true
+    tty: true
+    volumes:
+      - "./mc:/data"
+      - "./mods:/mods:ro"
+    depends_on:
+      - lazytainer
+    network_mode: service:lazytainer
+    environment:
+      EULA: "TRUE"
+      TYPE: "FORGE"
+
+      TZ: "Europe/Zurich"
+      MAX_TICK_TIME: "-1"
+      INIT_MEMORY: 128M
+      MAX_MEMORY: 20G
+
+      #OVERRIDE_SERVER_PROPERTIES: "TRUE"
+      #ENABLE_AUTOPAUSE: "TRUE"
+      #AUTOPAUSE_TIMEOUT_INIT: "30"
+      #AUTOPAUSE_TIMEOUT_EST: "10"
+
+
+      DIFFICULTY: "easy"
+