fix: account for moved sed commands
Build Container Image / build_amd64 (push) Successful in 2m17s Details
Build Container Image / build_i386 (push) Successful in 2m5s Details
Build Container Image / push_amd64 (push) Successful in 22s Details
Build Container Image / push_i386 (push) Successful in 17s Details
Build Container Image / build_arm64 (push) Successful in 7m39s Details
Build Container Image / push_arm64 (push) Successful in 18s Details
Build Container Image / build_armhf (push) Successful in 17m22s Details
Build Container Image / push_armhf (push) Successful in 18s Details
Build Container Image / build_riscv64 (push) Successful in 20m19s Details
Build Container Image / push_riscv64 (push) Successful in 18s Details
Build Container Image / build (push) Successful in 3m20s Details
Build Container Image / push (push) Successful in 3m9s Details
Build Container Image / update_readme (push) Successful in 10s Details

This commit is contained in:
Daniel Wolf 2024-03-29 14:38:57 -04:00
parent f1e9c770bc
commit 6611466044
Signed by: nephatrine
GPG Key ID: 59D70EC2E4AAB4D0
1 changed files with 6 additions and 6 deletions

View File

@ -37,13 +37,13 @@ WORKDIR /root/pakextract
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
RUN git -C /root clone --single-branch --depth=1 https://github.com/DirtBagXon/3zb2-zigflag.git \
&& if [ ! "$(uname -m)" = "x86_64" ]; then sed -i "s~-msse2 -mfpmath=sse~~g" Makefile; fi
&& if [ ! "$(uname -m)" = "x86_64" ]; then sed -i "s~-msse2 -mfpmath=sse~~g" /root/3zb2-zigflag/Makefile; fi
WORKDIR /root/3zb2-zigflag
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
&& mv 3zb2/pak10.pak 3zb2/pak6.pak
RUN git -C /root clone --single-branch --depth=1 https://github.com/QwazyWabbitWOS/lmctf60.git \
&& sed -i 's~ldd -r~ldd~g' GNUmakefile
&& sed -i 's~ldd -r~ldd~g' /root/lmctf60/GNUmakefile
WORKDIR /root/lmctf60
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
&& mv game*.so game.so
@ -55,10 +55,10 @@ RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
# hadolint ignore=SC2016
RUN git -C /root clone --single-branch --depth=1 https://github.com/packetflinger/opentdm.git \
&& sed -i "s~shell pkg-config libcurl --cflags~shell curl-config --cflags~g" Makefile \
&& sed -i "s~shell pkg-config libcurl --libs~shell curl-config --libs~g" Makefile \
&& sed -i "s~-DCURL_STATICLIB~~g" Makefile \
&& sed -i 's~deps/[^ ]*~$(CURL_LIBS)~g' Makefile \
&& sed -i "s~shell pkg-config libcurl --cflags~shell curl-config --cflags~g" /root/opentdm/Makefile \
&& sed -i "s~shell pkg-config libcurl --libs~shell curl-config --libs~g" /root/opentdm/Makefile \
&& sed -i "s~-DCURL_STATICLIB~~g" /root/opentdm/Makefile \
&& sed -i 's~deps/[^ ]*~$(CURL_LIBS)~g' /root/opentdm/Makefile
WORKDIR /root/opentdm
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
&& mv game*.so game.so