Skip to content

Commit 5adb6d5

Browse files
authored
fix: backported patch to fix #15516 from Luanti. (#29)
Added some trivial patching mechanism for the Docker build, too.
2 parents 92ecd77 + 0562370 commit 5adb6d5

File tree

2 files changed

+632
-2
lines changed

2 files changed

+632
-2
lines changed

Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,25 @@ RUN apt-get update &&\
2222

2323
# Fetch source
2424
RUN mkdir -p /usr/src &&\
25-
git clone --depth=1 -b ${LUANTI_VERSION} \
25+
git clone -b ${LUANTI_VERSION} \
2626
https://github.com/minetest/minetest \
2727
/usr/src/minetest &&\
2828
rm -rf /usr/src/minetest/.git
29-
RUN git clone --depth=1 https://github.com/minetest/minetest_game \
29+
RUN git clone https://github.com/minetest/minetest_game \
3030
/usr/src/minetest/games/minetest_game &&\
3131
git -C /usr/src/minetest/games/minetest_game checkout ${MINETEST_GAME_VERSION}
3232
RUN git clone \
3333
https://github.com/LuaJIT/LuaJIT \
3434
/usr/src/luajit &&\
3535
git -C /usr/src/luajit checkout ${LUAJIT_VERSION}
3636

37+
# Apply patches
38+
ADD patches /usr/src/patches
39+
RUN cd /usr/src/minetest ;\
40+
ls -1 /usr/src/patches/${LUANTI_VERSION}-*.patch | while read file ; do \
41+
patch -p1 < $file ; \
42+
done
43+
3744
# Install Contentdb CLI
3845
RUN echo "Building for arch $(uname -m)" &&\
3946
case $(uname -m) in \

0 commit comments

Comments
 (0)