prokop/docker-crawl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

horal

Browse Source 
upgrade to ubuntu 24.04
stable version: 0.32.1
print name of stable version, urls have still trunk
This commit is contained in:
prokop
2025-03-20 15:12:57 +01:00
parent b81c9c9ea6
commit 6345dcaf7e
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile.webtiles
View File

@@ -1,5 +1,5 @@
# Builder image # Builder image
FROM ubuntu:20.04 AS builder FROM ubuntu:24.04 AS builder
# Variables # Variables
ENV CRAWL_REPO="https://github.com/crawl/crawl.git" \ 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" \ lsof sudo libbot-basicbot-perl" \
BUILD_DEPS="autoconf bison build-essential flex git libncursesw5-dev \ BUILD_DEPS="autoconf bison build-essential flex git libncursesw5-dev \
libsqlite3-dev libz-dev pkg-config binutils-gold libsdl2-image-dev libsdl2-mixer-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 DEBIAN_FRONTEND=noninteractive
# Install packages for the build # Install packages for the build
@@ -17,23 +17,23 @@ RUN apt-get update && \
apt-get install -y ${BUILD_DEPS} ${APP_DEPS} apt-get install -y ${BUILD_DEPS} ${APP_DEPS}
# Retrieve crawl # Retrieve crawl
RUN git clone ${CRAWL_REPO} /src/ RUN git clone --branch 0.32.1 ${CRAWL_REPO} /src/
# Build crawl # Build crawl
RUN cd /src/crawl-ref/source && \ 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 # Set up webserver components
RUN cp -r /src/crawl-ref/source/webserver /app/ && \ RUN cp -r /src/crawl-ref/source/webserver /app/ && \
cp -r /src/crawl-ref/source/util /app/ cp -r /src/crawl-ref/source/util /app/
# Runtime image # Runtime image
FROM ubuntu:20.04 FROM ubuntu:24.04
# Environment Variables # Environment Variables
ENV APP_DEPS="bzip2 liblua5.1-0-dev python3-minimal python3-pip python3-yaml \ ENV APP_DEPS="bzip2 liblua5.1-0-dev python3-minimal python3-pip python3-yaml \
python-is-python3 ncurses-term locales-all sqlite3 libpcre3 locales \ 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 \ DATA_DIR=/data \
DEBIAN_FRONTEND=noninteractive DEBIAN_FRONTEND=noninteractive
@@ -43,7 +43,7 @@ RUN apt-get update && \
apt-get install -y ${APP_DEPS} apt-get install -y ${APP_DEPS}
# Install Tornado # Install Tornado
RUN pip3 install tornado #RUN pip3 install tornado
# Copy over the compiled files # Copy over the compiled files
COPY --from=builder /app/ /app/ COPY --from=builder /app/ /app/

21
docker-compose.yaml
View File

@@ -1,11 +1,16 @@
version: "3"
services: services:
crawl: crawl:
image: frozenfoxx/crawl:latest build:
container_name: "crawl_webtiles" context: .
restart: always dockerfile: Dockerfile.webtiles
ports: image: crawl
- 80:8080 container_name: "dcss"
restart: unless-stopped
volumes: volumes:
- /data/crawl:/data - ./data:/data
networks:
- caddy
networks:
caddy:
external: true

2
webserver/config.py
View File

@@ -75,7 +75,7 @@ use_game_yaml = True
# All options in this config are documented in games.d/base.yaml. # All options in this config are documented in games.d/base.yaml.
games = OrderedDict([ games = OrderedDict([
("dcss-web-trunk", dict( ("dcss-web-trunk", dict(
name = "Play trunk", name = "Play 0.32.1",
crawl_binary = "/app/bin/crawl", crawl_binary = "/app/bin/crawl",
rcfile_path = "/data/rcs/", rcfile_path = "/data/rcs/",
macro_path = "/data/rcs/", macro_path = "/data/rcs/",