10 Commits

Author SHA1 Message Date
faf5db940b Merge pull request 'chore(deps): update docker.io/library/rust docker tag to v1.93.1' (#88) from renovate/container-images into master
All checks were successful
Build / build-amd64 (push) Successful in 2m53s
Lint Markdown files / markdown-lint (push) Successful in 5s
Build / build-arm64 (push) Successful in 9m8s
2026-02-13 02:21:58 +00:00
44855903ba chore(deps): update docker.io/library/rust docker tag to v1.93.1
All checks were successful
Build / build-amd64 (pull_request) Successful in 3m1s
Lint Markdown files / markdown-lint (pull_request) Successful in 5s
Build / build-arm64 (pull_request) Successful in 9m9s
2026-02-13 02:12:39 +00:00
3d7826e8a2 Merge pull request 'chore(deps): update docker/login-action action to v3.7.0' (#87) from renovate/actions into master
Some checks failed
Build / build-amd64 (push) Successful in 3m27s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Failing after 19m24s
2026-02-01 12:15:51 +00:00
bcf251372a chore(deps): update docker/login-action action to v3.7.0
All checks were successful
Build / build-amd64 (pull_request) Successful in 3m23s
Lint Markdown files / markdown-lint (pull_request) Successful in 6s
Build / build-arm64 (pull_request) Successful in 11m3s
2026-02-01 11:13:43 +00:00
5a83601780 Merge pull request 'chore(deps): update docker.io/library/rust docker tag to v1.93.0' (#86) from renovate/container-images into master
All checks were successful
Build / build-amd64 (push) Successful in 2m48s
Lint Markdown files / markdown-lint (push) Successful in 5s
Build / build-arm64 (push) Successful in 9m14s
2026-01-22 23:19:52 +00:00
df200c2a25 chore(deps): update docker.io/library/rust docker tag to v1.93.0
All checks were successful
Build / build-amd64 (pull_request) Successful in 2m58s
Lint Markdown files / markdown-lint (pull_request) Successful in 5s
Build / build-arm64 (pull_request) Successful in 9m10s
2026-01-22 23:10:34 +00:00
0f1a2f9d3c Merge pull request 'chore(deps): update actions/checkout action to v6.0.2' (#85) from renovate/actions into master
All checks were successful
Build / build-amd64 (push) Successful in 2m53s
Lint Markdown files / markdown-lint (push) Successful in 5s
Build / build-arm64 (push) Successful in 9m5s
2026-01-22 19:32:57 +00:00
22f41b4875 chore(deps): update actions/checkout action to v6.0.2
All checks were successful
Build / build-amd64 (pull_request) Successful in 2m54s
Lint Markdown files / markdown-lint (pull_request) Successful in 5s
Build / build-arm64 (pull_request) Successful in 9m14s
2026-01-22 17:14:18 +00:00
89d8d65955 fix(Dockerfile): checkout correct branch
All checks were successful
Build / build-amd64 (push) Successful in 2m48s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Successful in 9m0s
Release / push-amd64 (push) Successful in 3m37s
Release / push-arm64 (push) Successful in 11m27s
Release / push-manifest (push) Successful in 5s
Release / sync-to-hub-docker-io (push) Successful in 48s
2026-01-14 11:02:59 +01:00
fde42c2738 fix(ci): add image suffix
Some checks failed
Build / build-amd64 (push) Failing after 45s
Lint Markdown files / markdown-lint (push) Successful in 4s
Build / build-arm64 (push) Failing after 1m41s
2026-01-14 10:44:44 +01:00
6 changed files with 36 additions and 23 deletions

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:
@@ -15,7 +19,7 @@ jobs:
build-arm64: build-arm64:
runs-on: ubuntu-latest-arm64 runs-on: ubuntu-latest-arm64
steps: steps:
- uses: actions/checkout@v6.0.1 - uses: actions/checkout@v6.0.2
- uses: docker/setup-qemu-action@v3.7.0 - uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.12.0 - uses: docker/setup-buildx-action@v3.12.0
@@ -27,13 +31,13 @@ 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:
runs-on: ubuntu-latest-amd64 runs-on: ubuntu-latest-amd64
steps: steps:
- uses: actions/checkout@v6.0.1 - uses: actions/checkout@v6.0.2
- uses: docker/setup-qemu-action@v3.7.0 - uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.12.0 - uses: docker/setup-buildx-action@v3.12.0
@@ -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 \
. .

View File

@@ -16,7 +16,7 @@ jobs:
runs-on: runs-on:
- ubuntu-latest - ubuntu-latest
steps: steps:
- uses: actions/checkout@v6.0.1 - uses: actions/checkout@v6.0.2
- uses: DavidAnson/markdownlint-cli2-action@v21.0.0 - uses: DavidAnson/markdownlint-cli2-action@v21.0.0
with: with:
globs: '**/*.md' globs: '**/*.md'

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:
@@ -9,11 +13,11 @@ jobs:
push-arm64: push-arm64:
runs-on: ubuntu-latest-arm64 runs-on: ubuntu-latest-arm64
steps: steps:
- uses: actions/checkout@v6.0.1 - uses: actions/checkout@v6.0.2
- uses: docker/setup-qemu-action@v3.7.0 - uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.12.0 - uses: docker/setup-buildx-action@v3.12.0
- uses: docker/login-action@v3.6.0 - uses: docker/login-action@v3.7.0
with: with:
registry: git.cryptic.systems registry: git.cryptic.systems
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
@@ -29,17 +33,17 @@ 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:
runs-on: ubuntu-latest-amd64 runs-on: ubuntu-latest-amd64
steps: steps:
- uses: actions/checkout@v6.0.1 - uses: actions/checkout@v6.0.2
- uses: docker/setup-qemu-action@v3.7.0 - uses: docker/setup-qemu-action@v3.7.0
- uses: docker/setup-buildx-action@v3.12.0 - uses: docker/setup-buildx-action@v3.12.0
- uses: docker/login-action@v3.6.0 - uses: docker/login-action@v3.7.0
with: with:
registry: git.cryptic.systems registry: git.cryptic.systems
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
@@ -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:
@@ -64,7 +68,7 @@ jobs:
- push-arm64 - push-arm64
- push-amd64 - push-amd64
steps: steps:
- uses: docker/login-action@v3.6.0 - uses: docker/login-action@v3.7.0
with: with:
registry: git.cryptic.systems registry: git.cryptic.systems
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
@@ -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}

View File

@@ -13,7 +13,7 @@ jobs:
runs-on: runs-on:
- ubuntu-latest - ubuntu-latest
steps: steps:
- uses: actions/checkout@v6.0.1 - uses: actions/checkout@v6.0.2
- uses: peter-evans/dockerhub-description@v5.0.0 - uses: peter-evans/dockerhub-description@v5.0.0
with: with:
username: ${{ secrets.DOCKER_IO_USERNAME }} username: ${{ secrets.DOCKER_IO_USERNAME }}

View File

@@ -1,4 +1,4 @@
FROM docker.io/library/rust:1.92.0-slim-bullseye AS build FROM docker.io/library/rust:1.93.1-slim-bullseye AS build
ARG RPMBUILDER_VERSION=master ARG RPMBUILDER_VERSION=master
@@ -9,11 +9,15 @@ RUN set -e && \
# compile musl and rpm-builder # compile musl and rpm-builder
RUN set -e && \ RUN set -e && \
git clone -b rpm-builder-${RPMBUILDER_VERSION} https://github.com/rpm-rs/rpm-builder.git /rpm-builder && \ if [ "${RPMBUILDER_VERSION}" != "master" ]; then \
git clone -b rpm-builder-${RPMBUILDER_VERSION} https://github.com/rpm-rs/rpm-builder.git /rpm-builder; \
else \
git clone -b master https://github.com/rpm-rs/rpm-builder.git /rpm-builder; \
fi && \
cd /rpm-builder && \ cd /rpm-builder && \
cargo build --profile release cargo build --profile release
FROM docker.io/library/debian:buster-slim FROM docker.io/library/debian:bullseye-slim
COPY --from=build /rpm-builder/target/release/rpm-builder /usr/bin/rpm-builder COPY --from=build /rpm-builder/target/release/rpm-builder /usr/bin/rpm-builder

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
# ============================================================================== # ==============================================================================