From 6345dcaf7e7b02275f7d7c642ff458f3d3741117 Mon Sep 17 00:00:00 2001
From: prokop <prokop.paruzek@paruzkovi.cz>
Date: Thu, 20 Mar 2025 15:12:57 +0100
Subject: [PATCH] horal

upgrade to ubuntu 24.04
stable version: 0.32.1
print name of stable version, urls have still trunk
---
 Dockerfile.webtiles | 16 ++++++++--------
 docker-compose.yaml | 21 +++++++++++++--------
 webserver/config.py |  4 ++--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Dockerfile.webtiles b/Dockerfile.webtiles
index f4dda48..aa436aa 100644
--- a/Dockerfile.webtiles
+++ b/Dockerfile.webtiles
@@ -1,5 +1,5 @@
 # Builder image
-FROM ubuntu:20.04 AS builder
+FROM ubuntu:24.04 AS builder
 
 # Variables
 ENV CRAWL_REPO="https://github.com/crawl/crawl.git" \
@@ -8,7 +8,7 @@ ENV CRAWL_REPO="https://github.com/crawl/crawl.git" \
     lsof sudo libbot-basicbot-perl" \
   BUILD_DEPS="autoconf bison build-essential flex git libncursesw5-dev \
     libsqlite3-dev libz-dev pkg-config binutils-gold libsdl2-image-dev libsdl2-mixer-dev \
-    libsdl2-dev libfreetype6-dev libpng-dev ttf-dejavu-core advancecomp pngcrush" \
+    libsdl2-dev libfreetype6-dev libpng-dev fonts-dejavu advancecomp pngcrush" \
   DEBIAN_FRONTEND=noninteractive
 
 # Install packages for the build
@@ -17,23 +17,23 @@ RUN apt-get update && \
   apt-get install -y ${BUILD_DEPS} ${APP_DEPS}
 
 # Retrieve crawl
-RUN git clone ${CRAWL_REPO} /src/
+RUN git clone --branch 0.32.1 ${CRAWL_REPO} /src/
 
 # Build crawl
 RUN cd /src/crawl-ref/source && \
-  make install -j4 DESTDIR=/app/ USE_DGAMELAUNCH=y WEBTILES=y
+  make install -j2 DESTDIR=/app/ USE_DGAMELAUNCH=y WEBTILES=y
 
 # Set up webserver components
 RUN cp -r /src/crawl-ref/source/webserver /app/ && \
   cp -r /src/crawl-ref/source/util /app/
 
 # Runtime image
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 
 # Environment Variables
 ENV APP_DEPS="bzip2 liblua5.1-0-dev python3-minimal python3-pip python3-yaml \
     python-is-python3 ncurses-term locales-all sqlite3 libpcre3 locales \
-    lsof sudo libbot-basicbot-perl" \
+    lsof sudo libbot-basicbot-perl python3-tornado" \
   DATA_DIR=/data \
   DEBIAN_FRONTEND=noninteractive
 
@@ -43,7 +43,7 @@ RUN apt-get update && \
   apt-get install -y ${APP_DEPS}
 
 # Install Tornado
-RUN pip3 install tornado
+#RUN pip3 install tornado
 
 # Copy over the compiled files
 COPY --from=builder /app/ /app/
@@ -67,4 +67,4 @@ EXPOSE 8080
 WORKDIR /app
 
 # Launch WebTiles server
-ENTRYPOINT [ "./entrypoint.sh" ]
\ No newline at end of file
+ENTRYPOINT [ "./entrypoint.sh" ]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 02a64a1..39f9967 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,11 +1,16 @@
-version: "3"
-
 services:
   crawl:
-    image: frozenfoxx/crawl:latest
-    container_name: "crawl_webtiles"
-    restart: always
-    ports:
-      - 80:8080
+    build:
+      context: .
+      dockerfile: Dockerfile.webtiles
+    image: crawl
+    container_name: "dcss"
+    restart: unless-stopped
     volumes:
-      - /data/crawl:/data
+      - ./data:/data
+    networks:
+      - caddy
+
+networks:
+  caddy:
+    external: true
diff --git a/webserver/config.py b/webserver/config.py
index 6635a5c..8d84217 100644
--- a/webserver/config.py
+++ b/webserver/config.py
@@ -75,7 +75,7 @@ use_game_yaml = True
 # All options in this config are documented in games.d/base.yaml.
 games = OrderedDict([
     ("dcss-web-trunk", dict(
-        name = "Play trunk",
+        name = "Play 0.32.1",
         crawl_binary = "/app/bin/crawl",
         rcfile_path = "/data/rcs/",
         macro_path = "/data/rcs/",
@@ -209,4 +209,4 @@ development_mode = False
 # Disable caching of static files which are not part of game data.
 no_cache = development_mode
 # Automatically log in all users with the username given here.
-autologin = None
\ No newline at end of file
+autologin = None