5 Commits

Author SHA1 Message Date
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
dresber 83911b842f implement an edge tag and update image security check accordingly 2026-06-14 09:51:36 +02:00
dresber f92d92355a add docker image scanner 2026-06-12 15:10:21 +02:00
4 changed files with 251 additions and 1 deletions
+74 -1
View File
@@ -9,6 +9,22 @@ on:
dockerfile_path: dockerfile_path:
type: string type: string
default: "." default: "."
floating_tag:
type: string
default: "edge"
run_image_scan:
type: boolean
default: true
scan_severity:
type: string
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 }
@@ -16,6 +32,7 @@ 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 }
jobs: jobs:
publish: publish:
@@ -54,14 +71,35 @@ jobs:
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: Build image
shell: bash
env:
PIP_EXTRA_INDEX_URL: ${{ secrets.PIP_EXTRA_INDEX_URL }}
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 }}"
docker build \ # optionally hand the private package index to the build as a BuildKit secret so the
# Dockerfile can install the in-house BB* packages without the token entering a layer
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
DOCKER_BUILDKIT=1 docker build \
${SECRET_ARGS} \
-t "${FULL_IMAGE}:${SHA_SHORT}" \ -t "${FULL_IMAGE}:${SHA_SHORT}" \
${{ inputs.dockerfile_path }} ${{ inputs.dockerfile_path }}
# Floating tag points at the most recent build on any branch/tag, so
# the nightly image-security scan always has a stable target even
# before a release exists. ":latest" stays release-only (below).
docker tag "${FULL_IMAGE}:${SHA_SHORT}" "${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}"
@@ -74,6 +112,38 @@ jobs:
docker tag "${FULL_IMAGE}:${SHA_SHORT}" "${FULL_IMAGE}:${MAJOR}" docker tag "${FULL_IMAGE}:${SHA_SHORT}" "${FULL_IMAGE}:${MAJOR}"
fi fi
- name: Image Vulnerability Scan
if: ${{ inputs.run_image_scan }}
shell: bash
run: |
set -euo pipefail
# Fallback for runner images without Trivy baked in. Pinned version +
# checksum, never "latest": Trivy releases were compromised in the
# March 2026 supply-chain incident (malicious v0.69.4). Keep in sync
# with the ARGs in the PipelineImage Dockerfiles.
TRIVY_VERSION=0.71.0
TRIVY_SHA256=30a3d22b23f88c233f1658f562fb477cae3b3e8b4761109d515b7698daf85814
if ! command -v trivy >/dev/null 2>&1; then
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"
echo "${TRIVY_SHA256} trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" | sha256sum -c -
tar -xzf "trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" -C /usr/local/bin trivy
rm "trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz"
fi
trivy --version
SHA_SHORT="$(git rev-parse --short HEAD)"
FULL_IMAGE="${{ secrets.DOCKER_REGISTRY }}/${{ inputs.image_name }}"
echo "=== Scanning ${FULL_IMAGE}:${SHA_SHORT} (fail on fixable ${{ inputs.scan_severity }}) ==="
trivy image \
--exit-code 1 \
--severity "${{ inputs.scan_severity }}" \
--ignore-unfixed \
--scanners vuln,secret \
"${FULL_IMAGE}:${SHA_SHORT}"
- name: Push image - name: Push image
shell: bash shell: bash
run: | run: |
@@ -105,6 +175,9 @@ jobs:
echo "=== Push SHA tag ===" echo "=== Push SHA tag ==="
docker push "${FULL_IMAGE}:${SHA_SHORT}" 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 if echo "${{ gitea.ref }}" | grep -q '^refs/tags/v'; then
echo "=== Version tag detected ===" echo "=== Version tag detected ==="
@@ -0,0 +1,70 @@
name: Reusable Image Security Checks
on:
workflow_call:
inputs:
image_name:
required: true
type: string
image_tag:
type: string
default: "edge"
scan_severity:
type: string
default: "HIGH,CRITICAL"
secrets:
REGISTRY_USERNAME: { required: true }
REGISTRY_PASSWORD: { required: true }
DOCKER_REGISTRY: { required: true }
jobs:
scan:
runs-on: docker
container:
image: gitea.tech-buddy.at/bitbuddydev/gitea_runner_python314:dev-bda315b82bb23d83065b77d91fedf0e20d9accf1
credentials:
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }}
steps:
- name: Docker Login
run: |
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "${{ secrets.DOCKER_REGISTRY }}" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
- name: Pull Image
shell: bash
run: |
set -euo pipefail
FULL_IMAGE="${{ secrets.DOCKER_REGISTRY }}/${{ inputs.image_name }}:${{ inputs.image_tag }}"
echo "=== Pulling ${FULL_IMAGE} ==="
docker pull "${FULL_IMAGE}"
- name: Image Vulnerability Scan
shell: bash
run: |
set -euo pipefail
# Fallback for runner images without Trivy baked in. Pinned version +
# checksum, never "latest": Trivy releases were compromised in the
# March 2026 supply-chain incident (malicious v0.69.4). Keep in sync
# with the ARGs in the PipelineImage Dockerfiles.
TRIVY_VERSION=0.71.0
TRIVY_SHA256=30a3d22b23f88c233f1658f562fb477cae3b3e8b4761109d515b7698daf85814
if ! command -v trivy >/dev/null 2>&1; then
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"
echo "${TRIVY_SHA256} trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" | sha256sum -c -
tar -xzf "trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" -C /usr/local/bin trivy
rm "trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz"
fi
trivy --version
FULL_IMAGE="${{ secrets.DOCKER_REGISTRY }}/${{ inputs.image_name }}:${{ inputs.image_tag }}"
echo "=== Scanning ${FULL_IMAGE} (fail on fixable ${{ inputs.scan_severity }}) ==="
trivy image \
--exit-code 1 \
--severity "${{ inputs.scan_severity }}" \
--ignore-unfixed \
--scanners vuln,secret \
"${FULL_IMAGE}"
+14
View File
@@ -21,6 +21,9 @@ 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:
@@ -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:dev-bda315b82bb23d83065b77d91fedf0e20d9accf1
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/*