Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Wolf f1e9c770bc
fix: we do not need to auth with dockerhub so much
Build Container Image / build_amd64 (push) Failing after 1m21s Details
Build Container Image / push_amd64 (push) Has been skipped Details
Build Container Image / build_i386 (push) Failing after 1m17s Details
Build Container Image / push_i386 (push) Has been skipped Details
Build Container Image / build_arm64 (push) Failing after 4m37s Details
Build Container Image / push_arm64 (push) Has been skipped Details
Build Container Image / build_armhf (push) Failing after 12m11s Details
Build Container Image / push_armhf (push) Has been skipped Details
Build Container Image / build_riscv64 (push) Failing after 16m51s Details
Build Container Image / push_riscv64 (push) Has been skipped Details
Build Container Image / build (push) Has been skipped Details
Build Container Image / push (push) Has been skipped Details
Build Container Image / update_readme (push) Has been skipped Details
2024-03-29 14:24:32 -04:00
Daniel Wolf 5c4e33e200
fix: keep hadolint satiated 2024-03-29 14:24:21 -04:00
2 changed files with 34 additions and 64 deletions

View File

@ -25,11 +25,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -89,11 +84,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -153,11 +143,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -217,11 +202,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -281,11 +261,6 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login (Pull Auth)
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''

View File

@ -2,80 +2,75 @@
#
# SPDX-License-Identifier: ISC
# hadolint ignore=DL3007
FROM code.nephatrine.net/nephnet/nxb-alpine:latest AS builder
RUN echo "====== INSTALL LIBRARIES ======" \
&& apk add --no-cache mesa-dev sdl2-dev
# hadolint ignore=DL3018
RUN apk add --no-cache mesa-dev sdl2-dev
ARG YQUAKE2_VERSION=QUAKE2_8_30
RUN git -C /root clone -b "$YQUAKE2_VERSION" --single-branch --depth=1 https://github.com/yquake2/yquake2.git
RUN echo "====== COMPILE QUAKE II ======" \
&& cd /root/yquake2 \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) server game
WORKDIR /root/yquake2
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) server game
ARG CTF_VERSION=CTF_1_10
RUN git -C /root clone -b "$CTF_VERSION" --single-branch --depth=1 https://github.com/yquake2/ctf.git
RUN echo "====== COMPILE CTF ======" \
&& cd /root/ctf \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
WORKDIR /root/ctf
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
ARG XATRIX_VERSION=XATRIX_2_12
RUN git -C /root clone -b "$XATRIX_VERSION" --single-branch --depth=1 https://github.com/yquake2/xatrix.git
RUN echo "====== COMPILE THE RECKONING ======" \
&& cd /root/xatrix \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
WORKDIR /root/xatrix
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
ARG ROGUE_VERSION=ROGUE_2_11
RUN git -C /root clone -b "$ROGUE_VERSION" --single-branch --depth=1 https://github.com/yquake2/rogue.git
RUN echo "====== COMPILE GROUND ZERO ======" \
&& cd /root/rogue \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
WORKDIR /root/rogue
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
RUN git -C /root clone --single-branch --depth=1 https://github.com/yquake2/zaero.git
RUN echo "====== COMPILE ZAERO ======" \
&& cd /root/zaero \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
WORKDIR /root/zaero
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
RUN git -C /root clone --single-branch --depth=1 https://github.com/yquake2/pakextract.git
RUN echo "====== COMPILE PAKEXTRACT ======" \
&& cd /root/pakextract \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
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
RUN echo "====== COMPILE 3ZB2 ======" \
&& cd /root/3zb2-zigflag \
&& if [ ! "$(uname -m)" = "x86_64" ]; then sed -i "s~-msse2 -mfpmath=sse~~g" Makefile; fi \
&& 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
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
RUN echo "====== COMPILE LMCTF ======" \
&& cd /root/lmctf60 \
&& sed -i 's~ldd -r~ldd~g' GNUmakefile \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
RUN git -C /root clone --single-branch --depth=1 https://github.com/QwazyWabbitWOS/lmctf60.git \
&& sed -i 's~ldd -r~ldd~g' GNUmakefile
WORKDIR /root/lmctf60
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
&& mv game*.so game.so
RUN git -C /root clone --single-branch --depth=1 https://github.com/skullernet/openffa.git
RUN echo "====== COMPILE OPENFFA ======" \
&& cd /root/openffa \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
WORKDIR /root/openffa
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
&& mv game*.so game.so
RUN git -C /root clone --single-branch --depth=1 https://github.com/packetflinger/opentdm.git
RUN echo "====== COMPILE OPENTDM ======" \
&& cd /root/opentdm \
# 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 \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
WORKDIR /root/opentdm
RUN make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
&& mv game*.so game.so
# ------------------------------
# hadolint ignore=DL3007
FROM code.nephatrine.net/nephnet/alpine-s6:latest
LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
RUN echo "====== INSTALL PACKAGES ======" \
&& apk add --no-cache curl libcurl screen sdl2 \
# hadolint ignore=DL3018
RUN apk add --no-cache curl libcurl screen sdl2 \
&& mkdir -p /mnt/shared /mnt/mirror
COPY --from=builder /root/pakextract/pakextract /usr/local/bin/