horal
upgrade to ubuntu 24.04 stable version: 0.32.1 print name of stable version, urls have still trunk
This commit is contained in:
@@ -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" ]
|
||||
ENTRYPOINT [ "./entrypoint.sh" ]
|
||||
|
||||
Reference in New Issue
Block a user