5 Commits

Author SHA1 Message Date
dresber a0a75210a3 switch to new image and update trivy checks 2026-07-25 21:55:15 +02:00
dresber a9f75d66fa add multi arch support 2026-07-25 10:46:59 +02:00
dresber 49f2277ea1 add passing secrets to docker build 2026-07-20 23:03:08 +02:00
dresber 06b4c4118c add python update in workflows 2026-07-20 22:40:29 +02:00
dresber 444b5efd39 add feature to use extra index URL 2026-07-20 19:41:26 +02:00
5 changed files with 242 additions and 89 deletions
+130 -84
View File
@@ -1,5 +1,15 @@
name: Reusable Docker Publish name: Reusable Docker Publish
# Multi-arch (v1.9.0+): builds a manifest list for `platforms` (amd64 + arm64 by default) with
# `docker buildx`, so the same tag runs on x86 servers and on the arm64 Raspberry Pi nodes with no
# per-host changes. The Trivy gate is preserved by building the native amd64 image first with
# --load, scanning that locally, and only then building + pushing the multi-arch manifest (the
# amd64 layers are reused from cache, so only arm64 is newly built).
#
# Runner requirements (baked into the PipelineImage runner; the workflow also self-installs as a
# fallback): the `docker buildx` plugin, and a build daemon that permits `--privileged` containers
# so QEMU/binfmt can be registered for cross-building arm64 on an amd64 runner.
on: on:
workflow_call: workflow_call:
inputs: inputs:
@@ -12,12 +22,24 @@ on:
floating_tag: floating_tag:
type: string type: string
default: "edge" default: "edge"
platforms:
# target platforms for the manifest list. Override to a single platform (e.g.
# "linux/amd64") for images that do not need to run on the arm64 nodes.
type: string
default: "linux/amd64,linux/arm64"
run_image_scan: run_image_scan:
type: boolean type: boolean
default: true default: true
scan_severity: scan_severity:
type: string type: string
default: "HIGH,CRITICAL" default: "HIGH,CRITICAL"
use_private_index:
# pass the private Gitea PyPI index into the build as a BuildKit secret, for images
# whose Dockerfile installs the in-house BB* packages. The Dockerfile must consume it
# via `RUN --mount=type=secret,id=pip_extra_index`, never as an ARG or ENV, so the
# token is not baked into an image layer.
type: boolean
default: false
secrets: secrets:
REGISTRY_USERNAME: { required: true } REGISTRY_USERNAME: { required: true }
REGISTRY_PASSWORD: { required: true } REGISTRY_PASSWORD: { required: true }
@@ -25,12 +47,24 @@ on:
NTFY_TOPIC: { required: true } NTFY_TOPIC: { required: true }
NTFY_TOKEN: { required: true } NTFY_TOKEN: { required: true }
NTFY_SERVER: { required: true } NTFY_SERVER: { required: true }
PIP_EXTRA_INDEX_URL: { required: false }
# Pinned build tooling. Keep in sync with the ARGs in the PipelineImage Dockerfiles.
# buildx: verify the binary against checksums.txt from the buildx GitHub release before bumping.
# binfmt: pin by digest (tonistiigi/binfmt@sha256:...) for the strongest posture; the version tag
# below is immutable enough for CI and avoids a Docker Hub token dance in the workflow.
env:
BUILDX_VERSION: "0.35.0"
BUILDX_SHA256: "d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda"
BINFMT_IMAGE: "tonistiigi/binfmt:qemu-v10.2.3"
TRIVY_VERSION: "0.72.0"
TRIVY_SHA256: "bbb64b9695866ce4a7a8f5c9592002c5961cab378577fa3f8a040df362b9b2ea"
jobs: jobs:
publish: publish:
runs-on: docker runs-on: docker
container: container:
image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:dev-bda315b82bb23d83065b77d91fedf0e20d9accf1 image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:1.0.3
credentials: credentials:
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
@@ -43,50 +77,89 @@ jobs:
id: vars id: vars
shell: bash shell: bash
run: | run: |
set -euo pipefail
SHA_SHORT="$(git rev-parse --short HEAD)" SHA_SHORT="$(git rev-parse --short HEAD)"
FULL_IMAGE="${{ secrets.DOCKER_REGISTRY }}/${{ inputs.image_name }}" FULL_IMAGE="${{ secrets.DOCKER_REGISTRY }}/${{ inputs.image_name }}"
TAGS="-t ${FULL_IMAGE}:${SHA_SHORT}"
# the SHA tag is always built; it is also the target Trivy scans before any push
PUSH_TAGS="-t ${FULL_IMAGE}:${SHA_SHORT} -t ${FULL_IMAGE}:${{ inputs.floating_tag }}"
if echo "${{ gitea.ref }}" | grep -q '^refs/tags/v'; then if echo "${{ gitea.ref }}" | grep -q '^refs/tags/v'; then
VERSION="${{ gitea.ref_name }}" VERSION="${{ gitea.ref_name }}"
VERSION="${VERSION#v}" VERSION="${VERSION#v}"
MAJOR="$(echo "$VERSION" | cut -d. -f1)" MAJOR="$(echo "$VERSION" | cut -d. -f1)"
MINOR="$(echo "$VERSION" | cut -d. -f1,2)" MINOR="$(echo "$VERSION" | cut -d. -f1,2)"
TAGS="${TAGS} -t ${FULL_IMAGE}:latest -t ${FULL_IMAGE}:${VERSION} -t ${FULL_IMAGE}:${MINOR} -t ${FULL_IMAGE}:${MAJOR}" PUSH_TAGS="${PUSH_TAGS} -t ${FULL_IMAGE}:latest -t ${FULL_IMAGE}:${VERSION} -t ${FULL_IMAGE}:${MINOR} -t ${FULL_IMAGE}:${MAJOR}"
fi fi
echo "docker_tags=${TAGS}" >> "$GITEA_OUTPUT" echo "scan_ref=${FULL_IMAGE}:${SHA_SHORT}" >> "$GITEA_OUTPUT"
echo "push_tags=${PUSH_TAGS}" >> "$GITEA_OUTPUT"
echo "full_image=${FULL_IMAGE}" >> "$GITEA_OUTPUT" echo "full_image=${FULL_IMAGE}" >> "$GITEA_OUTPUT"
- name: Docker Login - name: Docker Login
run: | run: |
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "${{ secrets.DOCKER_REGISTRY }}" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "${{ secrets.DOCKER_REGISTRY }}" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
- name: Build image - name: Set up Docker Buildx and QEMU
shell: bash
env:
PLATFORMS: ${{ inputs.platforms }}
run: | run: |
SHA_SHORT="$(git rev-parse --short HEAD)" set -euo pipefail
FULL_IMAGE="${{ secrets.DOCKER_REGISTRY }}/${{ inputs.image_name }}"
docker build \ # Ensure the buildx plugin. Baked into the runner image (PipelineImage); this fallback
-t "${FULL_IMAGE}:${SHA_SHORT}" \ # covers older runners, mirroring the Trivy fallback below. Pinned + checksum-verified.
${{ inputs.dockerfile_path }} if ! docker buildx version >/dev/null 2>&1; then
echo "=== buildx not in runner image, installing v${BUILDX_VERSION} ==="
# Floating tag points at the most recent build on any branch/tag, so mkdir -p /usr/libexec/docker/cli-plugins
# the nightly image-security scan always has a stable target even curl -sSfLo /usr/libexec/docker/cli-plugins/docker-buildx \
# before a release exists. ":latest" stays release-only (below). "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-amd64"
docker tag "${FULL_IMAGE}:${SHA_SHORT}" "${FULL_IMAGE}:${{ inputs.floating_tag }}" echo "${BUILDX_SHA256} /usr/libexec/docker/cli-plugins/docker-buildx" | sha256sum -c -
chmod +x /usr/libexec/docker/cli-plugins/docker-buildx
if echo "${{ gitea.ref }}" | grep -q '^refs/tags/v'; then
VERSION="${{ gitea.ref_name }}"
VERSION="${VERSION#v}"
MAJOR="$(echo "$VERSION" | cut -d. -f1)"
MINOR="$(echo "$VERSION" | cut -d. -f1,2)"
docker tag "${FULL_IMAGE}:${SHA_SHORT}" "${FULL_IMAGE}:latest"
docker tag "${FULL_IMAGE}:${SHA_SHORT}" "${FULL_IMAGE}:${VERSION}"
docker tag "${FULL_IMAGE}:${SHA_SHORT}" "${FULL_IMAGE}:${MINOR}"
docker tag "${FULL_IMAGE}:${SHA_SHORT}" "${FULL_IMAGE}:${MAJOR}"
fi fi
docker buildx version
# Register QEMU so this amd64 runner can cross-build the non-native platforms. binfmt is
# a kernel concern, so it cannot live in the runner image and is installed here against
# the build daemon (needs --privileged).
if echo "${PLATFORMS}" | grep -q 'arm'; then
echo "=== Registering QEMU emulators (${BINFMT_IMAGE}) ==="
docker run --privileged --rm "${BINFMT_IMAGE}" --install arm64
fi
# A docker-container builder is required for multi-platform output (the default docker
# driver builds a single platform only). Idempotent across re-runs on a warm runner.
docker buildx inspect multiarch >/dev/null 2>&1 || \
docker buildx create --name multiarch --driver docker-container --bootstrap
docker buildx use multiarch
- name: Build image for vulnerability scan
if: ${{ inputs.run_image_scan }}
shell: bash
env:
PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }}
run: |
set -euo pipefail
SECRET_ARGS=""
if [ "${{ inputs.use_private_index }}" = "true" ]; then
if [ -z "${PIP_EXTRA_INDEX_URL:-}" ]; then
echo "use_private_index=true but the PIP_EXTRA_INDEX_URL secret is empty or not set"
exit 1
fi
SECRET_ARGS="--secret id=pip_extra_index,env=PIP_EXTRA_INDEX_URL"
fi
# native amd64 only, loaded into the local image store so Trivy can scan it before
# anything is pushed. The amd64 result is cached and reused by the multi-arch push.
# CVEs live in the base image and OS/Python packages, which are identical across arches,
# so scanning amd64 is a faithful gate for the whole manifest list.
DOCKER_BUILDKIT=1 docker buildx build \
--load \
--platform linux/amd64 \
${SECRET_ARGS} \
-t "${{ steps.vars.outputs.scan_ref }}" \
${{ inputs.dockerfile_path }}
- name: Image Vulnerability Scan - name: Image Vulnerability Scan
if: ${{ inputs.run_image_scan }} if: ${{ inputs.run_image_scan }}
@@ -98,8 +171,6 @@ jobs:
# checksum, never "latest": Trivy releases were compromised in the # checksum, never "latest": Trivy releases were compromised in the
# March 2026 supply-chain incident (malicious v0.69.4). Keep in sync # March 2026 supply-chain incident (malicious v0.69.4). Keep in sync
# with the ARGs in the PipelineImage Dockerfiles. # with the ARGs in the PipelineImage Dockerfiles.
TRIVY_VERSION=0.71.0
TRIVY_SHA256=30a3d22b23f88c233f1658f562fb477cae3b3e8b4761109d515b7698daf85814
if ! command -v trivy >/dev/null 2>&1; then if ! command -v trivy >/dev/null 2>&1; then
echo "=== Trivy not in runner image, installing v${TRIVY_VERSION} ===" echo "=== Trivy not in runner image, installing v${TRIVY_VERSION} ==="
curl -sSfLO "https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" curl -sSfLO "https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz"
@@ -109,74 +180,49 @@ jobs:
fi fi
trivy --version trivy --version
SHA_SHORT="$(git rev-parse --short HEAD)" echo "=== Scanning ${{ steps.vars.outputs.scan_ref }} (fail on fixable ${{ inputs.scan_severity }}) ==="
FULL_IMAGE="${{ secrets.DOCKER_REGISTRY }}/${{ inputs.image_name }}"
echo "=== Scanning ${FULL_IMAGE}:${SHA_SHORT} (fail on fixable ${{ inputs.scan_severity }}) ==="
trivy image \ trivy image \
--exit-code 1 \ --exit-code 1 \
--severity "${{ inputs.scan_severity }}" \ --severity "${{ inputs.scan_severity }}" \
--ignore-unfixed \ --ignore-unfixed \
--scanners vuln,secret \ --scanners vuln,secret \
"${FULL_IMAGE}:${SHA_SHORT}" "${{ steps.vars.outputs.scan_ref }}"
- name: Push image - name: Build and push multi-arch image
shell: bash shell: bash
env:
PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }}
run: | run: |
set -euxo pipefail set -euxo pipefail
echo "=== Git / Ref Info ===" echo "=== Git / Ref Info ==="
git rev-parse HEAD git rev-parse HEAD
git rev-parse --short HEAD
echo "gitea.ref=${{ gitea.ref }}" echo "gitea.ref=${{ gitea.ref }}"
echo "gitea.ref_name=${{ gitea.ref_name }}" echo "gitea.ref_name=${{ gitea.ref_name }}"
echo "platforms=${{ inputs.platforms }}"
SHA_SHORT="$(git rev-parse --short HEAD)" SECRET_ARGS=""
FULL_IMAGE="${{ secrets.DOCKER_REGISTRY }}/${{ inputs.image_name }}" if [ "${{ inputs.use_private_index }}" = "true" ]; then
if [ -z "${PIP_EXTRA_INDEX_URL:-}" ]; then
echo "use_private_index=true but the PIP_EXTRA_INDEX_URL secret is empty or not set"
exit 1
fi
SECRET_ARGS="--secret id=pip_extra_index,env=PIP_EXTRA_INDEX_URL"
fi
echo "=== Image Info ===" # one build produces every platform and pushes a manifest list per tag. The Trivy gate
echo "FULL_IMAGE=${FULL_IMAGE}" # above already ran on the amd64 image these layers are reused from, so a scan failure
echo "SHA_SHORT=${SHA_SHORT}" # aborts the job before this step. On a version tag this also pushes latest/major/minor.
echo "Expected image: ${FULL_IMAGE}:${SHA_SHORT}" DOCKER_BUILDKIT=1 docker buildx build \
--push \
--platform "${{ inputs.platforms }}" \
${SECRET_ARGS} \
${{ steps.vars.outputs.push_tags }} \
${{ inputs.dockerfile_path }}
echo "=== Local Docker Images ===" - name: Verify pushed manifest
docker images | grep "${{ inputs.image_name }}" || true shell: bash
run: |
echo "=== Inspect Image ===" set -euo pipefail
docker image inspect "${FULL_IMAGE}:${SHA_SHORT}" >/dev/null # confirm the pushed tag really is a multi-arch manifest list
docker buildx imagetools inspect "${{ steps.vars.outputs.scan_ref }}"
echo "=== Docker Auth Check ==="
docker info
echo "=== Push SHA tag ==="
docker push "${FULL_IMAGE}:${SHA_SHORT}"
echo "=== Push floating tag (${{ inputs.floating_tag }}) ==="
docker push "${FULL_IMAGE}:${{ inputs.floating_tag }}"
if echo "${{ gitea.ref }}" | grep -q '^refs/tags/v'; then
echo "=== Version tag detected ==="
VERSION="${{ gitea.ref_name }}"
VERSION="${VERSION#v}"
MAJOR="$(echo "$VERSION" | cut -d. -f1)"
MINOR="$(echo "$VERSION" | cut -d. -f1,2)"
echo "VERSION=${VERSION}"
echo "MINOR=${MINOR}"
echo "MAJOR=${MAJOR}"
echo "=== Push latest ==="
docker push "${FULL_IMAGE}:latest"
echo "=== Push version ==="
docker push "${FULL_IMAGE}:${VERSION}"
echo "=== Push minor ==="
docker push "${FULL_IMAGE}:${MINOR}"
echo "=== Push major ==="
docker push "${FULL_IMAGE}:${MAJOR}"
else
echo "=== No version tag detected, only SHA tag pushed ==="
fi
+3 -3
View File
@@ -21,7 +21,7 @@ jobs:
scan: scan:
runs-on: docker runs-on: docker
container: container:
image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:dev-bda315b82bb23d83065b77d91fedf0e20d9accf1 image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:1.0.3
credentials: credentials:
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
@@ -48,8 +48,8 @@ jobs:
# checksum, never "latest": Trivy releases were compromised in the # checksum, never "latest": Trivy releases were compromised in the
# March 2026 supply-chain incident (malicious v0.69.4). Keep in sync # March 2026 supply-chain incident (malicious v0.69.4). Keep in sync
# with the ARGs in the PipelineImage Dockerfiles. # with the ARGs in the PipelineImage Dockerfiles.
TRIVY_VERSION=0.71.0 TRIVY_VERSION=0.72.0
TRIVY_SHA256=30a3d22b23f88c233f1658f562fb477cae3b3e8b4761109d515b7698daf85814 TRIVY_SHA256=bbb64b9695866ce4a7a8f5c9592002c5961cab378577fa3f8a040df362b9b2ea
if ! command -v trivy >/dev/null 2>&1; then if ! command -v trivy >/dev/null 2>&1; then
echo "=== Trivy not in runner image, installing v${TRIVY_VERSION} ===" echo "=== Trivy not in runner image, installing v${TRIVY_VERSION} ==="
curl -sSfLO "https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" curl -sSfLO "https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz"
+15 -1
View File
@@ -21,12 +21,15 @@ on:
run_security_scan: run_security_scan:
type: boolean type: boolean
default: true default: true
use_private_index:
type: boolean
default: false
jobs: jobs:
check: check:
runs-on: docker runs-on: docker
container: container:
image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:dev-bda315b82bb23d83065b77d91fedf0e20d9accf1 image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:1.0.3
credentials: credentials:
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
@@ -35,6 +38,17 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Configure private package index
if: ${{ inputs.use_private_index }}
env:
PRIVATE_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }}
run: |
if [ -z "$PRIVATE_INDEX_URL" ]; then
echo "use_private_index=true but the PIP_EXTRA_INDEX_URL secret is empty or not set"
exit 1
fi
pip config --site set global.extra-index-url "$PRIVATE_INDEX_URL"
- name: Install Tools & Deps - name: Install Tools & Deps
run: | run: |
python -m pip install --upgrade pip setuptools wheel python -m pip install --upgrade pip setuptools wheel
@@ -0,0 +1,93 @@
name: Reusable Python Package Publish
# Builds a Python package with `python -m build` and uploads it to the Gitea PyPI registry with
# twine. Intended to run only on version tags (v*), alongside python-checks, so a package is
# never published without its tests passing.
#
# The caller gates this job on python-checks and on the tag ref, the same way docker-publish is
# gated. The job itself additionally refuses to publish when the git tag does not match the
# version declared in pyproject.toml, so a mistyped tag cannot ship the wrong version.
on:
workflow_call:
inputs:
package_name:
# informational, used only in log output
required: true
type: string
use_private_index:
# build backends that need the in-house BB* packages to resolve build dependencies
type: boolean
default: false
secrets:
REGISTRY_USERNAME: { required: true }
REGISTRY_PASSWORD: { required: true }
PYPI_UPLOAD_URL: { required: true }
PYPI_UPLOAD_USER: { required: true }
PYPI_UPLOAD_PASSWORD: { required: true }
jobs:
publish:
runs-on: docker
container:
image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:1.0.3
credentials:
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Configure private package index
if: ${{ inputs.use_private_index }}
env:
PRIVATE_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }}
run: |
if [ -z "$PRIVATE_INDEX_URL" ]; then
echo "use_private_index=true but the PIP_EXTRA_INDEX_URL secret is empty or not set"
exit 1
fi
pip config --site set global.extra-index-url "$PRIVATE_INDEX_URL"
- name: Verify the tag matches the package version
shell: bash
run: |
set -euo pipefail
if ! echo "${{ gitea.ref }}" | grep -q '^refs/tags/v'; then
echo "This workflow only publishes on version tags (refs/tags/v*), got '${{ gitea.ref }}'"
exit 1
fi
TAG_VERSION="${{ gitea.ref_name }}"
TAG_VERSION="${TAG_VERSION#v}"
PROJECT_VERSION="$(python -c "import tomllib;print(tomllib.load(open('pyproject.toml','rb'))['project']['version'])")"
echo "tag version : ${TAG_VERSION}"
echo "pyproject version: ${PROJECT_VERSION}"
if [ "${TAG_VERSION}" != "${PROJECT_VERSION}" ]; then
echo "Tag v${TAG_VERSION} does not match the version ${PROJECT_VERSION} in pyproject.toml"
echo "Bump the version in pyproject.toml and retag, so the published artifact matches the tag."
exit 1
fi
- name: Build the package
shell: bash
run: |
set -euo pipefail
python -m pip install --upgrade pip build twine
python -m build
echo "=== built artifacts for ${{ inputs.package_name }} ==="
ls -1 dist
- name: Check the artifacts
run: python -m twine check dist/*
- name: Upload to the package registry
env:
TWINE_USERNAME: ${{ secrets.PYPI_UPLOAD_USER }}
TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_PASSWORD }}
run: |
python -m twine upload --repository-url "${{ secrets.PYPI_UPLOAD_URL }}" dist/*
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
security: security:
runs-on: docker runs-on: docker
container: container:
image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:dev-bda315b82bb23d83065b77d91fedf0e20d9accf1 image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:1.0.3
credentials: credentials:
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}