Compare commits

...

3 Commits

Author SHA1 Message Date
Daniel Wolf 81ae00bea2
fix issue introduced into yamagi zaero module
Build Container Image / build_amd64 (push) Successful in 2m5s Details
Build Container Image / build_i386 (push) Successful in 1m51s Details
Build Container Image / build_arm64 (push) Successful in 6m56s Details
Build Container Image / build_riscv64 (push) Successful in 10m10s Details
Build Container Image / build_armhf (push) Successful in 13m31s Details
Build Container Image / build_manifest (push) Successful in 35s Details
2024-03-06 11:09:00 -05:00
Daniel Wolf ec3eea2b23
migrate to docker buildx 2024-03-06 11:08:30 -05:00
Daniel Wolf f1afd038c5
cut down on discord spam 2024-02-28 12:57:20 -05:00
2 changed files with 129 additions and 162 deletions

View File

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023 Daniel Wolf <nephatrine@gmail.com>
# SPDX-FileCopyrightText: 2023 - 2024 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
@ -14,13 +14,9 @@ jobs:
runs-on: nephnet-amd64
steps:
- name: Checkout Repository
uses: https://gitea.com/actions/checkout@v3
- name: Docker Build
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-amd64-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-amd64 ${{ gitea.workspace }}
uses: https://gitea.com/actions/checkout@v4
- name: BuildX Setup
uses: https://github.com/docker/setup-buildx-action@v3
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -28,12 +24,27 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/quake2-yamagi:master-amd64
with:
context: .
platforms: linux/amd64
provenance: false
pull: true
push: true
tags: code.nephatrine.net/nephnet/quake2-yamagi:latest-amd64
cache-from: type=registry,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-amd64
cache-to: type=registry,image-manifest=true,oci-mediatypes=true,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-amd64,mode=max
- name: Build & Push (Branch)
if: gitea.ref_name != 'master' && gitea.ref_name != ''
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-unknown}
docker buildx build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-latest-amd64 --platform linux/amd64 ${{ gitea.workspace }}
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
if: failure()
with:
title: "Container Build (X86_64)"
webhook: ${{ secrets.DISCORD_WEBHOOK_BUILD }}
@ -42,13 +53,9 @@ jobs:
runs-on: nephnet-i386
steps:
- name: Checkout Repository
uses: https://gitea.com/actions/checkout@v3
- name: Docker Build
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-i386-cached --target builder --platform linux/386 ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-i386 --platform linux/386 ${{ gitea.workspace }}
uses: https://gitea.com/actions/checkout@v4
- name: BuildX Setup
uses: https://github.com/docker/setup-buildx-action@v3
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -56,12 +63,27 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/quake2-yamagi:master-i386
with:
context: .
platforms: linux/386
provenance: false
pull: true
push: true
tags: code.nephatrine.net/nephnet/quake2-yamagi:latest-i386
cache-from: type=registry,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-i386
cache-to: type=registry,image-manifest=true,oci-mediatypes=true,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-i386,mode=max
- name: Build & Push (Branch)
if: gitea.ref_name != 'master' && gitea.ref_name != ''
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-unknown}
docker buildx build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-latest-i386 --platform linux/386 ${{ gitea.workspace }}
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
if: failure()
with:
title: "Container Build (I686)"
webhook: ${{ secrets.DISCORD_WEBHOOK_BUILD }}
@ -70,13 +92,9 @@ jobs:
runs-on: nephnet-arm64
steps:
- name: Checkout Repository
uses: https://gitea.com/actions/checkout@v3
- name: Docker Build
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-arm64v8-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-arm64v8 ${{ gitea.workspace }}
uses: https://gitea.com/actions/checkout@v4
- name: BuildX Setup
uses: https://github.com/docker/setup-buildx-action@v3
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -84,12 +102,27 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/quake2-yamagi:master-arm64v8
with:
context: .
platforms: linux/arm64/v8
provenance: false
pull: true
push: true
tags: code.nephatrine.net/nephnet/quake2-yamagi:latest-arm64
cache-from: type=registry,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-arm64
cache-to: type=registry,image-manifest=true,oci-mediatypes=true,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-arm64,mode=max
- name: Build & Push (Branch)
if: gitea.ref_name != 'master' && gitea.ref_name != ''
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-unknown}
docker buildx build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-latest-arm64 --platform linux/arm64/v8 ${{ gitea.workspace }}
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
if: failure()
with:
title: "Container Build (AARCH64)"
webhook: ${{ secrets.DISCORD_WEBHOOK_BUILD }}
@ -98,13 +131,9 @@ jobs:
runs-on: nephnet-armhf
steps:
- name: Checkout Repository
uses: https://gitea.com/actions/checkout@v3
- name: Docker Build
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-armv7-cached --target builder --platform linux/arm/v7 ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-armv7 --platform linux/arm/v7 ${{ gitea.workspace }}
uses: https://gitea.com/actions/checkout@v4
- name: BuildX Setup
uses: https://github.com/docker/setup-buildx-action@v3
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -112,12 +141,27 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/quake2-yamagi:master-armv7
with:
context: .
platforms: linux/arm/v7
provenance: false
pull: true
push: true
tags: code.nephatrine.net/nephnet/quake2-yamagi:latest-armv7
cache-from: type=registry,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-armv7
cache-to: type=registry,image-manifest=true,oci-mediatypes=true,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-armv7,mode=max
- name: Build & Push (Branch)
if: gitea.ref_name != 'master' && gitea.ref_name != ''
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-unknown}
docker buildx build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-latest-armv7 --platform linux/arm/v7 ${{ gitea.workspace }}
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
if: failure()
with:
title: "Container Build (ARMV7L)"
webhook: ${{ secrets.DISCORD_WEBHOOK_BUILD }}
@ -126,13 +170,9 @@ jobs:
runs-on: nephnet-riscv64
steps:
- name: Checkout Repository
uses: https://gitea.com/actions/checkout@v3
- name: Docker Build
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-master}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-riscv64-cached --target builder ${{ gitea.workspace }}
docker build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-riscv64 ${{ gitea.workspace }}
uses: https://gitea.com/actions/checkout@v4
- name: BuildX Setup
uses: https://github.com/docker/setup-buildx-action@v3
- name: Docker Login
uses: https://github.com/docker/login-action@v3
if: gitea.ref_name == 'master' || gitea.ref_name == ''
@ -140,150 +180,75 @@ jobs:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Push
- name: Build & Push (Master)
uses: https://github.com/docker/build-push-action@v5
if: gitea.ref_name == 'master' || gitea.ref_name == ''
run: docker push code.nephatrine.net/nephnet/quake2-yamagi:master-riscv64
with:
context: .
platforms: linux/riscv64
provenance: false
pull: true
push: true
tags: code.nephatrine.net/nephnet/quake2-yamagi:latest-riscv64
cache-from: type=registry,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-riscv64
cache-to: type=registry,image-manifest=true,oci-mediatypes=true,ref=code.nephatrine.net/nephnet/quake2-yamagi-cache:latest-riscv64,mode=max
- name: Build & Push (Branch)
if: gitea.ref_name != 'master' && gitea.ref_name != ''
run: |
export BRANCH=${GITHUB_REF##*/}
export BRANCH=${BRANCH:-unknown}
docker buildx build --pull -t code.nephatrine.net/nephnet/quake2-yamagi:${BRANCH}-latest-riscv64 --platform linux/riscv64 ${{ gitea.workspace }}
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: always()
if: failure()
with:
title: "Container Build (RISCV64)"
webhook: ${{ secrets.DISCORD_WEBHOOK_BUILD }}
build_manifest:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_amd64, build_i386, build_arm64, build_armhf, build_riscv64]
runs-on: nephnet
steps:
- name: Docker Login
uses: https://github.com/docker/login-action@v3
with:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Manifest
run: |
docker manifest create code.nephatrine.net/nephnet/quake2-yamagi:latest --amend code.nephatrine.net/nephnet/quake2-yamagi:master-amd64 --amend code.nephatrine.net/nephnet/quake2-yamagi:master-i386 --amend code.nephatrine.net/nephnet/quake2-yamagi:master-arm64v8 --amend code.nephatrine.net/nephnet/quake2-yamagi:master-armv7 --amend code.nephatrine.net/nephnet/quake2-yamagi:master-riscv64
docker manifest push --purge code.nephatrine.net/nephnet/quake2-yamagi:latest
publish_amd64:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_amd64]
runs-on: nephnet-amd64
steps:
- name: Docker Login
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/quake2-yamagi:master-amd64
docker tag code.nephatrine.net/nephnet/quake2-yamagi:master-amd64 nephatrine/quake2-server:yamagi-amd64
docker push nephatrine/quake2-server:yamagi-amd64
docker rmi nephatrine/quake2-server:yamagi-amd64
publish_i386:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_i386]
runs-on: nephnet-i386
steps:
- name: Docker Login
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/quake2-yamagi:master-i386
docker tag code.nephatrine.net/nephnet/quake2-yamagi:master-i386 nephatrine/quake2-server:yamagi-i386
docker push nephatrine/quake2-server:yamagi-i386
docker rmi nephatrine/quake2-server:yamagi-i386
publish_arm64:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_arm64]
runs-on: nephnet-arm64
steps:
- name: Docker Login
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/quake2-yamagi:master-arm64v8
docker tag code.nephatrine.net/nephnet/quake2-yamagi:master-arm64v8 nephatrine/quake2-server:yamagi-arm64v8
docker push nephatrine/quake2-server:yamagi-arm64v8
docker rmi nephatrine/quake2-server:yamagi-arm64v8
publish_armhf:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_armhf]
runs-on: nephnet-armhf
steps:
- name: Docker Login
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/quake2-yamagi:master-armv7
docker tag code.nephatrine.net/nephnet/quake2-yamagi:master-armv7 nephatrine/quake2-server:yamagi-armv7
docker push nephatrine/quake2-server:yamagi-armv7
docker rmi nephatrine/quake2-server:yamagi-armv7
publish_riscv64:
if: gitea.ref_name == 'master' || gitea.ref_name == ''
needs: [build_riscv64]
runs-on: nephnet-riscv64
steps:
- name: Docker Login
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Push
run: |
docker pull code.nephatrine.net/nephnet/quake2-yamagi:master-riscv64
docker tag code.nephatrine.net/nephnet/quake2-yamagi:master-riscv64 nephatrine/quake2-server:yamagi-riscv64
docker push nephatrine/quake2-server:yamagi-riscv64
docker rmi nephatrine/quake2-server:yamagi-riscv64
publish_manifest:
needs: [publish_amd64, publish_i386, publish_arm64, publish_armhf, publish_riscv64]
runs-on: nephnet
steps:
- name: Check Base Image
if: gitea.event_name == 'schedule'
uses: https://github.com/lucacome/docker-image-update-checker@v1
id: checkbase
with:
base-image: nephatrine/alpine-s6:latest
image: nephatrine/quake2-server:yamagi
base-image: code.nephatrine.net/nephnet/alpine-s6:internal
image: nephatrine/quake2-server:yamagi-latest
platforms: linux/amd64
- name: Docker Login
uses: https://github.com/docker/login-action@v3
with:
registry: code.nephatrine.net
username: ${{ gitea.actor }}
password: ${{ secrets.PACKAGER_TOKEN }}
- name: Docker Login
uses: https://github.com/docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Docker Manifest
run: |
docker manifest create nephatrine/quake2-server:yamagi-8.30 --amend nephatrine/quake2-server:yamagi-amd64 --amend nephatrine/quake2-server:yamagi-i386 --amend nephatrine/quake2-server:yamagi-arm64v8 --amend nephatrine/quake2-server:yamagi-armv7 --amend nephatrine/quake2-server:yamagi-riscv64
docker manifest create nephatrine/quake2-server:yamagi-8 --amend nephatrine/quake2-server:yamagi-amd64 --amend nephatrine/quake2-server:yamagi-i386 --amend nephatrine/quake2-server:yamagi-arm64v8 --amend nephatrine/quake2-server:yamagi-armv7 --amend nephatrine/quake2-server:yamagi-riscv64
docker manifest create nephatrine/quake2-server:yamagi --amend nephatrine/quake2-server:yamagi-amd64 --amend nephatrine/quake2-server:yamagi-i386 --amend nephatrine/quake2-server:yamagi-arm64v8 --amend nephatrine/quake2-server:yamagi-armv7 --amend nephatrine/quake2-server:yamagi-riscv64
docker manifest create nephatrine/quake2-server:latest --amend nephatrine/quake2-server:yamagi-amd64 --amend nephatrine/quake2-server:yamagi-i386 --amend nephatrine/quake2-server:yamagi-arm64v8 --amend nephatrine/quake2-server:yamagi-armv7 --amend nephatrine/quake2-server:yamagi-riscv64
docker manifest push --purge nephatrine/quake2-server:yamagi-8.30
docker manifest push --purge nephatrine/quake2-server:yamagi-8
docker manifest push --purge nephatrine/quake2-server:yamagi
docker manifest push --purge nephatrine/quake2-server:latest
run: docker buildx imagetools create -t code.nephatrine.net/nephnet/quake2-yamagi:latest -t nephatrine/quake2-server:latest -t nephatrine/quake2-server:yamagi-latest -t nephatrine/quake2-server:yamagi-8.30 -t nephatrine/quake2-server:yamagi-8 code.nephatrine.net/nephnet/quake2-yamagi:latest-amd64 code.nephatrine.net/nephnet/quake2-yamagi:latest-i386 code.nephatrine.net/nephnet/quake2-yamagi:latest-arm64 code.nephatrine.net/nephnet/quake2-yamagi:latest-armv7 code.nephatrine.net/nephnet/quake2-yamagi:latest-riscv64
- name: Notify Discord
if: gitea.event_name != 'schedule' || steps.checkbase.outputs.needs-updating == 'true'
uses: https://github.com/sarisia/actions-status-discord@v1
with:
title: "DockerHub: quake2-yamagi"
description: "The container image was pushed to [DockerHub](https://hub.docker.com/repository/docker/nephatrine/quake2-server/general).\nPull `nephatrine/quake2-server:yamagi` for the newest image."
title: "DockerHub: quake2-server"
description: "The container image was pushed to [DockerHub](https://hub.docker.com/repository/docker/nephatrine/quake2-server/general).\nPull `nephatrine/quake2-server:yamagi-latest` for the newest image."
nodetail: true
webhook: ${{ secrets.DISCORD_WEBHOOK_PACKAGE }}
- name: Checkout Repository
uses: https://gitea.com/actions/checkout@v3
uses: https://gitea.com/actions/checkout@v4
- name: Docker Describe
uses: https://github.com/peter-evans/dockerhub-description@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
repository: nephatrine/quake2-server
- name: Notify Discord
uses: https://github.com/sarisia/actions-status-discord@v1
if: failure()
with:
title: "Container Publish"
webhook: ${{ secrets.DISCORD_WEBHOOK_PACKAGE }}

View File

@ -1,8 +1,8 @@
# SPDX-FileCopyrightText: 2020 - 2023 Daniel Wolf <nephatrine@gmail.com>
# SPDX-FileCopyrightText: 2020 - 2024 Daniel Wolf <nephatrine@gmail.com>
#
# SPDX-License-Identifier: ISC
FROM nephatrine/nxbuilder:alpine AS builder
FROM code.nephatrine.net/nephnet/nxb-alpine:internal AS builder
RUN echo "====== INSTALL LIBRARIES ======" \
&& apk add --no-cache mesa-dev sdl2-dev
@ -34,6 +34,8 @@ RUN echo "====== COMPILE GROUND ZERO ======" \
RUN git -C /root clone --single-branch --depth=1 https://github.com/yquake2/zaero.git
RUN echo "====== COMPILE ZAERO ======" \
&& cd /root/zaero \
&& sed -i 's~-DYQ2OSTYPE~-DYQ2_OSTYPE~g' Makefile \
&& sed -i 's~-DYQ2ARCH~-DYQ2_ARCH~g' Makefile \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 ))
RUN git -C /root clone --single-branch --depth=1 https://github.com/yquake2/pakextract.git
@ -71,7 +73,7 @@ RUN echo "====== COMPILE OPENTDM ======" \
&& make -j$(( $(getconf _NPROCESSORS_ONLN) / 2 + 1 )) \
&& mv game*.so game.so
FROM nephatrine/alpine-s6:latest
FROM code.nephatrine.net/nephnet/alpine-s6:internal
LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
RUN echo "====== INSTALL PACKAGES ======" \