File tree Expand file tree Collapse file tree 3 files changed +11
-24
lines changed
Expand file tree Collapse file tree 3 files changed +11
-24
lines changed Original file line number Diff line number Diff line change 1616 - ' docgen/**'
1717 - ' builder.Dockerfile'
1818
19- env :
20- CC : gcc-7 -m64
21- CXX : g++-7 -m64
22-
23- concurrency :
19+ concurrency :
2420 group : " build"
2521 cancel-in-progress : false
2622
Original file line number Diff line number Diff line change @@ -6,14 +6,12 @@ FROM $NWSERVER_IMAGE
66RUN mkdir -p /nwn/nwnx
77
88# Install plugin run dependencies
9- RUN runDeps="hunspell \
10- default-libmysqlclient-dev \
9+ RUN runDeps="default-libmysqlclient-dev \
1110 libmariadb3 \
1211 libpq5 \
1312 libsqlite3-0 \
14- libruby2.5 \
15- luajit libluajit-5.1 \
16- libssl1.1 \
13+ libruby3.1 \
14+ libssl3 \
1715 inotify-tools \
1816 patch \
1917 unzip \
@@ -24,12 +22,11 @@ RUN runDeps="hunspell \
2422 installDeps="ca-certificates wget" \
2523 && apt-get update \
2624 && apt-get install -y --no-install-recommends $installDeps \
27- && wget https://packages.microsoft.com/config/debian/10 /packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
25+ && wget https://packages.microsoft.com/config/debian/12 /packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
2826 && dpkg -i packages-microsoft-prod.deb \
2927 && rm packages-microsoft-prod.deb \
3028 && apt-get update \
3129 && apt-get -y install --no-install-recommends $runDeps \
32- && ln -s /usr/lib/x86_64-linux-gnu/libhunspell-?.*.so /usr/lib/x86_64-linux-gnu/libhunspell.so \
3330 && rm -rf /var/cache/apt /var/lib/apt/lists/*
3431
3532# Patch run-server.sh with our modifications
Original file line number Diff line number Diff line change 22# build dependencies change. This docker image created is pushed to Dockerhub and GHCR and is the base
33# image when users build their own docker images for NWNX:EE.
44
5- FROM debian:buster -slim
5+ FROM debian:bookworm -slim
66
77RUN buildDeps="build-essential \
88 git \
99 ssh-client \
1010 zip \
1111 cmake \
1212 gperf \
13- gcc-7 \
14- g++-7 \
13+ gcc \
14+ g++ \
15+ swig \
1516 default-libmysqlclient-dev \
1617 libpq-dev \
1718 libseccomp-dev \
1819 ruby-dev \
1920 libssl-dev \
20- libhunspell-dev \
2121 pkg-config \
22- libluajit-5.1-dev \
2322 libpcre3 \
2423 libpcre3-dev \
2524 autoconf \
@@ -29,10 +28,5 @@ RUN buildDeps="build-essential \
2928 && apt-get update \
3029 && apt-get install -y --no-install-recommends $buildDeps \
3130 && apt-get clean \
32- && rm -r /var/lib/apt/lists /var/cache/apt \
33- && git clone --branch v4.0.2 --depth 1 https://github.com/swig/swig.git \
34- && cd swig \
35- && ./autogen.sh \
36- && ./configure \
37- && make \
38- && make install
31+ && rm -r /var/lib/apt/lists /var/cache/apt
32+
You can’t perform that action at this time.
0 commit comments