Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docker-compose.yml

docker-compose.yml

@@ -9,7 +9,8 @@ services:
       - "80:80"
       - "443:443"
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      #- /var/run/docker.sock:/var/run/docker.sock
+      - "////./pipe/docker_engine:/var/run/docker.sock"
       - ./traefik.yml:/etc/traefik/traefik.yml
       - ./authorized_users:/etc/traefik/authorized_users
       - ./acme.json:/acme.json
@@ -54,41 +55,32 @@ services:
       # Docker engine
       - --providers.docker.endpoint=npipe:////./pipe/docker_engine
 
-  ollama:
+  minecraft-test-docker:
-    image: ollama/ollama
+    image: itzg/minecraft-server
     restart: unless-stopped
-    container_name: ollama
-    ports:
-      - '11434:11434'
     volumes:
-      - './ollama:/root/.ollama'
+      - "./mc:/data"
-
-  ollama-webui:
-    image: 'ghcr.io/ollama-webui/ollama-webui:main'
-    restart: unless-stopped
-    container_name: ollama-webui
-    volumes:
-      - './ollama-webui:/app/backend/data'
-    depends_on:
-      - ollama
     ports:
-      - 80:8080
+      - "25565:25565"
     environment:
-      - './ollama/api=http://ollama:11434/api'
+      EULA: "TRUE"
-    extra_hosts:
+      TYPE: FORGE
-      - host.docker.internal:host-gateway
+      VERSION: "1.20.1"
-    labels:
+      FORGE_VERSION: "47.2.32"
-        - "traefik.enable=true"
+      ENABLE_AUTOPAUSE: "TRUE"
-        - "traefik.http.routers.ollama-webui-http.entrypoints=http"
+      INIT_MEMORY: "256M"
-        - "traefik.http.routers.ollama-webui-http.rule=Host(`ollama.localhost/`)"
+      MAX_MEMORY: "25G"
-        - "traefik.http.routers.ollama-webui-http.middlewares=ollama-webui-redirect"
+      TZ: "Europe/Berne"
-        - "traefik.http.middlewares.ollama-webui-redirect.redirectscheme.scheme=https"
+
-        - "traefik.http.routers.ollama-webui-https.entrypoints=https"
+      OVERRIDE_SERVER_PROPERTIES: "TRUE"
-        - "traefik.http.routers.ollama-webui-https.rule=Host(`ollama.localhost/`)"
+      MAX_TICK_TIME: "-1"
-        - "traefik.http.routers.ollama-webui-https.tls.certResolver=letsencrypt"
+      DIFFICULTY: "normal"
-        - "traefik.http.routers.ollama-webui-https.service=ollama-webui"
+      MODE: "creative"
-        - "traefik.http.routers.ollama-webui-https.middlewares=ollama-webui-auth"
+      MOTD: "Welcome Home"
-        - "traefik.http.middlewares.ollama-webui-auth.basicauth.usersfile=/etc/traefik/authorized_users"
+
+      # More aggressive settings for demo purposes
+      AUTOPAUSE_TIMEOUT_INIT: "30"
+      AUTOPAUSE_TIMEOUT_EST: "10"
 
   lazytainer:
     image: ghcr.io/vmorganp/lazytainer:master