volker.raschek/rpm-builder-docker
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

fix(ci): add image suffix
Some checks failed
Build / build-amd64 (push) Failing after 45s
Details
Lint Markdown files / markdown-lint (push) Successful in 4s
Details
Build / build-arm64 (push) Failing after 1m41s
Details

Browse Source
This commit is contained in:
Markus Pesch
2026-01-14 10:44:44 +01:00
parent 7d7dad0c0b
commit fde42c2738
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitea/workflows/build.yaml
View File

@@ -1,5 +1,9 @@
name: Build name: Build
env:
# Introduce suffix for new upstream repository
RPMBUILDER_SUFFIX: rs
on: on:
pull_request: pull_request:
types: types:
@@ -27,7 +31,7 @@ jobs:
--platform linux/arm64 \ --platform linux/arm64 \
--file Dockerfile \ --file Dockerfile \
--provenance false \ --provenance false \
--tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-arm64 \ --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-arm64 \
. .
build-amd64: build-amd64:
@@ -45,5 +49,5 @@ jobs:
--platform linux/amd64 \ --platform linux/amd64 \
--file Dockerfile \ --file Dockerfile \
--provenance false \ --provenance false \
--tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-amd64 \ --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-amd64 \
. .

20
.gitea/workflows/release.yaml
View File

@@ -1,5 +1,9 @@
name: Release name: Release
env:
# Introduce suffix for new upstream repository
RPMBUILDER_SUFFIX: rs
on: on:
push: push:
tags: tags:
@@ -29,7 +33,7 @@ jobs:
--platform linux/arm64 \ --platform linux/arm64 \
--provenance false \ --provenance false \
--push \ --push \
--tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-arm64 \ --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-arm64 \
. .
push-amd64: push-amd64:
@@ -55,7 +59,7 @@ jobs:
--platform linux/amd64 \ --platform linux/amd64 \
--provenance false \ --provenance false \
--push \ --push \
--tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-amd64 \ --tag git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-amd64 \
. .
push-manifest: push-manifest:
@@ -74,11 +78,11 @@ jobs:
run: | run: |
TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm') TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
docker manifest create git.cryptic.systems/volker.raschek/rpm-builder:${TAG} \ docker manifest create git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX} \
--amend git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-amd64 \ --amend git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-amd64 \
--amend git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-arm64 --amend git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}-arm64
docker manifest push git.cryptic.systems/volker.raschek/rpm-builder:${TAG} docker manifest push git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}
sync-to-hub-docker-io: sync-to-hub-docker-io:
needs: needs:
@@ -97,5 +101,5 @@ jobs:
--dest-username ${{ secrets.DOCKER_IO_USERNAME }} \ --dest-username ${{ secrets.DOCKER_IO_USERNAME }} \
--src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \ --src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \
--src-username volker.raschek \ --src-username volker.raschek \
docker://git.cryptic.systems/volker.raschek/rpm-builder:${TAG} \ docker://git.cryptic.systems/volker.raschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX} \
docker://docker.io/volkerraschek/rpm-builder:${TAG} docker://docker.io/volkerraschek/rpm-builder:${TAG}-${RPMBUILDER_SUFFIX}

3
Makefile
View File

@@ -15,7 +15,8 @@ RPMBUILDER_IMAGE_REGISTRY_USER?=volker.raschek
RPMBUILDER_IMAGE_NAMESPACE?=${RPMBUILDER_IMAGE_REGISTRY_USER} RPMBUILDER_IMAGE_NAMESPACE?=${RPMBUILDER_IMAGE_REGISTRY_USER}
RPMBUILDER_IMAGE_NAME:=rpm-builder RPMBUILDER_IMAGE_NAME:=rpm-builder
RPMBUILDER_IMAGE_VERSION?=latest RPMBUILDER_IMAGE_VERSION?=latest
RPMBUILDER_IMAGE_FULLY_QUALIFIED=${RPMBUILDER_IMAGE_REGISTRY_NAME}/${RPMBUILDER_IMAGE_NAMESPACE}/${RPMBUILDER_IMAGE_NAME}:${RPMBUILDER_IMAGE_VERSION} RPMBUILDER_IMAGE_SUFFIX?=rs
RPMBUILDER_IMAGE_FULLY_QUALIFIED=${RPMBUILDER_IMAGE_REGISTRY_NAME}/${RPMBUILDER_IMAGE_NAMESPACE}/${RPMBUILDER_IMAGE_NAME}:${RPMBUILDER_IMAGE_VERSION}-${RPMBUILDER_IMAGE_SUFFIX}
# BUILD CONTAINER IMAGE # BUILD CONTAINER IMAGE
# ============================================================================== # ==============================================================================