Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab177ecb46 | ||
|
|
c0d6ecf9f6 | ||
|
|
979335fe31 | ||
|
|
6ee8b2da6a | ||
|
|
26468ba73d | ||
|
|
b90b98bafb | ||
|
|
7c8359099c | ||
|
|
94d0ba6b78 | ||
|
|
52fab24049 | ||
|
|
1d363f0eac | ||
|
|
dfe768f871 | ||
|
|
fc400e752d | ||
|
|
78d295d616 | ||
|
|
55b6b50672 | ||
|
|
e82c65a3c4 | ||
|
|
ade9877f07 | ||
|
|
371eedc0ef | ||
|
|
2656687937 | ||
|
|
6a93557620 | ||
|
|
632d2d7465 |
No files matched your search
@@ -0,0 +1,47 @@
|
||||
#!/usr/bin/env bash
|
||||
# Recompute the pinned SHA-256 of the Trivy and gitleaks release tarballs
|
||||
# after a version bump. Renovate runs it as a postUpgradeTask (tth/renovate
|
||||
# config.json), so a bump PR carries matching checksums; by hand:
|
||||
# bash .gitea/update-checksums.sh
|
||||
#
|
||||
# Each tarball is downloaded and hashed here, and the hash must ALSO match
|
||||
# the release's own checksums file - the pin is what we verified at bump
|
||||
# time, the action then refuses any other bytes.
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
work=$(mktemp -d)
|
||||
trap 'rm -rf "$work"' EXIT
|
||||
|
||||
# pin <action.yml> <version var> <repo> <name prefix> <arch suffix> <sha var>...
|
||||
pin() {
|
||||
local file=$1 vvar=$2 repo=$3 prefix=$4
|
||||
shift 4
|
||||
local ver
|
||||
ver=$(sed -n "s/^ *$vvar: *\"\([0-9.]*\)\".*/\1/p" "$file")
|
||||
[ -n "$ver" ] || {
|
||||
echo "no $vvar in $file" >&2
|
||||
exit 1
|
||||
}
|
||||
local base="https://github.com/$repo/releases/download/v$ver"
|
||||
curl -fsSL --retry 3 -o "$work/sums" "$base/${prefix}_${ver}_checksums.txt"
|
||||
while [ "$#" -gt 0 ]; do
|
||||
local arch=$1 svar=$2
|
||||
shift 2
|
||||
local tgz="${prefix}_${ver}_${arch}.tar.gz"
|
||||
curl -fsSL --retry 3 -o "$work/$tgz" "$base/$tgz"
|
||||
local got want
|
||||
got=$(sha256sum "$work/$tgz" | cut -d' ' -f1)
|
||||
want=$(awk -v f="$tgz" '$2 == f {print $1}' "$work/sums")
|
||||
[ "$got" = "$want" ] || {
|
||||
echo "$tgz: downloaded $got, release says ${want:-nothing}" >&2
|
||||
exit 1
|
||||
}
|
||||
sed -i "s/^\( *$svar: *\)[0-9a-f]\{64\}/\1$got/" "$file"
|
||||
echo "$tgz $got"
|
||||
done
|
||||
}
|
||||
|
||||
pin trivy-gate/action.yml TRIVY_VERSION aquasecurity/trivy trivy \
|
||||
Linux-64bit TRIVY_SHA256_AMD64 Linux-ARM64 TRIVY_SHA256_ARM64
|
||||
pin gitleaks/action.yml GITLEAKS_VERSION gitleaks/gitleaks gitleaks \
|
||||
linux_x64 GITLEAKS_SHA256_X64 linux_arm64 GITLEAKS_SHA256_ARM64
|
||||
@@ -0,0 +1,58 @@
|
||||
# PR check (Renovate bumps of Trivy / gitleaks, and any other PR): the
|
||||
# actions of THIS branch must actually run. Both runtimes of trivy-gate:
|
||||
# the Trivy container (docker job) and the pinned binary with its checksum
|
||||
# check (container job without Docker) - a bump with a wrong checksum fails
|
||||
# here, not in every pipeline that uses the next tag. Required by branch
|
||||
# protection, so a green PR automerges and tag.yml cuts the next vN.
|
||||
name: pr-check
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
concurrency:
|
||||
group: pr-check-${{ github.head_ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
docker:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- name: trivy-gate, Trivy container, image scan
|
||||
id: image
|
||||
uses: ./trivy-gate
|
||||
with:
|
||||
image: alpine:3.22@sha256:2e0b81d60597f449baa56dc25d355367869d2dca4cd57e866f1e2b52af3eb55f
|
||||
runtime: docker
|
||||
mode: warn
|
||||
- name: The report is real
|
||||
run: |
|
||||
set -euo pipefail
|
||||
jq -e '.Results | length > 0' "${{ steps.image.outputs.report }}" >/dev/null
|
||||
echo "blocking=${{ steps.image.outputs.blocking }}"
|
||||
- name: gitleaks
|
||||
uses: ./gitleaks
|
||||
with:
|
||||
mode: block
|
||||
|
||||
binary:
|
||||
runs-on: ubuntu-latest
|
||||
# No Docker CLI here, so trivy-gate falls back to the pinned binary.
|
||||
container:
|
||||
image: node:26-trixie-slim@sha256:e6bedef217677b276c591795e169840edd9096dbf13f29df8ef8d1856b8820bc
|
||||
steps:
|
||||
- name: Tools the actions expect
|
||||
run: apt-get update -qq && apt-get install -y -qq --no-install-recommends ca-certificates curl git jq >/dev/null
|
||||
- uses: actions/checkout@v7
|
||||
- name: trivy-gate, pinned binary, fs scan
|
||||
id: fs
|
||||
uses: ./trivy-gate
|
||||
with:
|
||||
scan-type: fs
|
||||
runtime: binary
|
||||
mode: warn
|
||||
- name: The report is real
|
||||
run: jq -e 'has("Results") or has("ArtifactName")' "${{ steps.fs.outputs.report }}" >/dev/null
|
||||
- name: gitleaks, pinned binary
|
||||
uses: ./gitleaks
|
||||
with:
|
||||
mode: block
|
||||
@@ -0,0 +1,31 @@
|
||||
# Cut the next major tag (vN) when a Renovate bump of a pinned tool lands on
|
||||
# main, so the pipelines get it through their own Renovate PR ("update
|
||||
# ci-actions to vN"). Only renovate-bot's merges: hand-made changes keep
|
||||
# being tagged by hand, with the README note.
|
||||
name: tag
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
|
||||
jobs:
|
||||
tag:
|
||||
if: github.actor == 'renovate-bot'
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Next vN on HEAD
|
||||
run: |
|
||||
set -euo pipefail
|
||||
git fetch -q --tags
|
||||
if git tag --points-at HEAD | grep -qE '^v[0-9]+$'; then
|
||||
echo "HEAD already tagged: $(git tag --points-at HEAD | tr '\n' ' ')"; exit 0
|
||||
fi
|
||||
last=$(git tag -l 'v[0-9]*' | grep -E '^v[0-9]+$' | sed 's/^v//' | sort -n | tail -1)
|
||||
next="v$((${last:-0} + 1))"
|
||||
git tag "$next" HEAD
|
||||
git push origin "refs/tags/$next"
|
||||
echo "tagged $next on $(git rev-parse --short HEAD): $(git log -1 --format=%s)"
|
||||
@@ -104,6 +104,20 @@ binary is verified by SHA-256.
|
||||
`v1` image gate + SBOM; `v2` fs scans, binary runtime, misconfig, gitleaks;
|
||||
`v3` gitleaks fetches the parent of a single commit in a depth-1 checkout
|
||||
(dispatch/cron runs scanned the whole tree as a root commit before).
|
||||
`v8` dtrack-sbom really never fails the job: the runner's `bash -e` turned
|
||||
an unreachable Dependency-Track into a failed build instead of a warning.
|
||||
`v12` portainer-deploy waits for the Swarm rollout before the smoke check
|
||||
and fails on a paused or rolled-back update: the smoke URL used to answer
|
||||
from the old task, so a new image that never started still gave a green
|
||||
deploy.
|
||||
|
||||
Pinned tools (Trivy binary + image, gitleaks) are bumped by Renovate
|
||||
(tth/renovate). Its post-upgrade task `.gitea/update-checksums.sh`
|
||||
recomputes the tarball SHA-256 pins (downloaded and checked against the
|
||||
release's checksums file); `.gitea/workflows/pr-check.yml` runs the actions
|
||||
of the PR branch with both Trivy runtimes; after the merge `tag.yml` cuts
|
||||
the next `vN`, which the pipelines then pick up through their own Renovate
|
||||
PR. Hand-made changes are tagged by hand as before.
|
||||
|
||||
## portainer-deploy
|
||||
|
||||
@@ -112,7 +126,11 @@ last step of the build → `trivy-gate` → move `latest` → deploy pipeline. T
|
||||
compose file in git is the single source of truth: Portainer's stored
|
||||
compose is replaced on every deploy. The stack's env vars (where the secrets
|
||||
live) are kept and never logged; only `vars` are overwritten. Images are
|
||||
re-pulled (`pullImage`).
|
||||
re-pulled (`pullImage`). The step then waits until every service the deploy
|
||||
changed has finished its Swarm update (`wait-rollout`, `rollout-timeout`,
|
||||
default 600 s incl. image pulls) and fails when the update is paused or
|
||||
rolled back; only then is `smoke-url` checked. Services the deploy did not
|
||||
touch are ignored, even when an older update of theirs is still paused.
|
||||
|
||||
```yaml
|
||||
- uses: https://git.rfa.cz/tth-pub/ci-actions/portainer-deploy@v5
|
||||
@@ -126,6 +144,7 @@ re-pulled (`pullImage`).
|
||||
smoke-url: https://app.example.org/health # optional
|
||||
smoke-status: "200"
|
||||
smoke-timeout: "180"
|
||||
rollout-timeout: "600" # optional; wait-rollout: "false" = old behaviour
|
||||
```
|
||||
|
||||
Config files from the repo can ride along as Swarm configs. Each becomes a
|
||||
|
||||
@@ -32,7 +32,7 @@ inputs:
|
||||
default: "5"
|
||||
trivy-image:
|
||||
description: Trivy container image, pinned by digest.
|
||||
default: aquasec/trivy:0.75.0@sha256:af6acf9a6b85dfe389a1941505c0ce9efef52a4719635e1a962f022a3d855daa
|
||||
default: aquasec/trivy:0.76.2@sha256:8f6bb947dbc528902e11f2f5be52f7b519f6a39d5d148f41166f2040499768fb
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
@@ -49,7 +49,11 @@ runs:
|
||||
MIN: ${{ inputs.min-components }}
|
||||
TRIVY: ${{ inputs.trivy-image }}
|
||||
run: |
|
||||
set -uo pipefail
|
||||
# The runner starts composite bash steps with -e; this script handles
|
||||
# every failure itself (warn, exit 0), so -e only turns an unguarded
|
||||
# command into a failed job - e.g. the cat of a resp.json curl never
|
||||
# wrote when Dependency-Track was unreachable.
|
||||
set +e -uo pipefail
|
||||
warn() { echo "::warning::SBOM $PROJECT/$VERSION: $*"; exit 0; }
|
||||
[ -n "$REPORT" ] && [ -f "$REPORT" ] || warn "no report (gate skipped?)"
|
||||
[ -n "$DT_KEY" ] || warn "no API key"
|
||||
|
||||
@@ -5,7 +5,9 @@ description: >
|
||||
replaced on every deploy, the stack's env vars (where the secrets live) are
|
||||
kept and only the given variables are overwritten. Images are re-pulled.
|
||||
Config files from the repo can be shipped as content-addressed Swarm
|
||||
configs. Optionally waits until a URL answers with the expected status.
|
||||
configs. Waits until Swarm has finished rolling out the services the
|
||||
deploy changed (a paused or rolled-back update fails the step), then
|
||||
optionally until a URL answers with the expected status.
|
||||
|
||||
inputs:
|
||||
url:
|
||||
@@ -46,8 +48,19 @@ inputs:
|
||||
prune:
|
||||
description: Remove services that are no longer in the compose file.
|
||||
default: "false"
|
||||
wait-rollout:
|
||||
description: >
|
||||
Wait until every service this deploy changed has finished its Swarm
|
||||
update; fail when the update is paused or rolled back. "false" = return
|
||||
right after the stack update (the old behaviour).
|
||||
default: "true"
|
||||
rollout-timeout:
|
||||
description: Seconds to wait for the rollout (image pulls included).
|
||||
default: "600"
|
||||
smoke-url:
|
||||
description: URL polled after the deploy until it answers smoke-status. Empty = no check.
|
||||
description: >
|
||||
URL polled after the rollout until it answers smoke-status. Empty = no
|
||||
check.
|
||||
default: ""
|
||||
smoke-status:
|
||||
description: Expected HTTP status of smoke-url.
|
||||
@@ -70,6 +83,8 @@ runs:
|
||||
CONFIGS: ${{ inputs.configs }}
|
||||
CONFIG_PREFIX: ${{ inputs.config-prefix }}
|
||||
PRUNE: ${{ inputs.prune }}
|
||||
WAIT_ROLLOUT: ${{ inputs.wait-rollout }}
|
||||
ROLLOUT_TIMEOUT: ${{ inputs.rollout-timeout }}
|
||||
SMOKE_URL: ${{ inputs.smoke-url }}
|
||||
SMOKE_STATUS: ${{ inputs.smoke-status }}
|
||||
SMOKE_TIMEOUT: ${{ inputs.smoke-timeout }}
|
||||
@@ -145,6 +160,24 @@ runs:
|
||||
sets[var] = name
|
||||
|
||||
_, stack = api("GET", f"/api/stacks/{stack_id}")
|
||||
|
||||
# Rollout: remember each service's last update start before the
|
||||
# PUT; afterwards only the services whose update start changed are
|
||||
# this deploy's. Comparing with the previous value, not with the
|
||||
# clock, keeps runner/Swarm clock skew out of it. Without this the
|
||||
# smoke check below answered from the OLD task (birdnet-go
|
||||
# 2026-11-03: green CI, then 1 min of 503) and a paused update
|
||||
# went unnoticed (revaj-crm-stage 2026-11-02).
|
||||
wait = E.get("WAIT_ROLLOUT", "true").lower() == "true"
|
||||
sflt = urllib.parse.quote(json.dumps(
|
||||
{"label": [f"com.docker.stack.namespace={stack.get('Name', '')}"]}))
|
||||
|
||||
def services():
|
||||
_, out = api("GET", f"{docker}/services?filters={sflt}")
|
||||
return {s["ID"]: s for s in out or []}
|
||||
|
||||
before = {i: (s.get("UpdateStatus") or {}).get("StartedAt")
|
||||
for i, s in services().items()} if wait else {}
|
||||
env = [e for e in (stack.get("Env") or []) if e.get("name") not in sets]
|
||||
kept = len(env)
|
||||
env += [{"name": k, "value": v} for k, v in sets.items()]
|
||||
@@ -159,6 +192,43 @@ runs:
|
||||
shown = ", ".join(f"{k}={v}" for k, v in sets.items()) or "nothing"
|
||||
print(f"stack {stack.get('Name', stack_id)} updated from {E['COMPOSE_FILE']}: {shown}; {kept} other variable(s) kept")
|
||||
|
||||
if wait:
|
||||
rollout_timeout = float(E.get("ROLLOUT_TIMEOUT") or 600)
|
||||
start = time.time()
|
||||
deadline, grace, shown_at = start + rollout_timeout, start + 20, 0.0
|
||||
while True:
|
||||
pending, failed, done = [], [], []
|
||||
for i, s in services().items():
|
||||
u = s.get("UpdateStatus") or {}
|
||||
if not u or (i in before and u.get("StartedAt") == before[i]):
|
||||
continue # untouched by this deploy, or newly created
|
||||
name, state = s["Spec"]["Name"], u.get("State", "")
|
||||
if state == "completed":
|
||||
done.append(name)
|
||||
elif state == "updating":
|
||||
pending.append(name)
|
||||
else: # paused, rollback_started / _paused / _completed
|
||||
failed.append(f"{name}: {state} ({u.get('Message', '')})")
|
||||
if failed:
|
||||
raise RuntimeError("rollout failed - " + "; ".join(failed))
|
||||
if pending:
|
||||
if time.time() >= deadline:
|
||||
raise RuntimeError(f"rollout not finished after {rollout_timeout:.0f} s: {', '.join(pending)}")
|
||||
if time.time() - shown_at >= 30:
|
||||
print(f"rollout: waiting for {', '.join(pending)}", flush=True)
|
||||
shown_at = time.time()
|
||||
elif done:
|
||||
print(f"rollout: completed in {time.time() - start:.0f} s: {', '.join(done)}")
|
||||
break
|
||||
elif time.time() >= grace:
|
||||
# The PUT can return before Swarm registers the update
|
||||
# (birdnet-go: PUT logged 00:29:25.908, update started
|
||||
# 25.929), hence the grace. Nothing after it = same
|
||||
# image digest and configs, Swarm had nothing to update.
|
||||
print("rollout: no service was updated by this deploy")
|
||||
break
|
||||
time.sleep(5)
|
||||
|
||||
# Older versions go once nothing mounts them; Docker refuses to
|
||||
# delete a config in use (the previous task may still be draining),
|
||||
# the next deploy retries.
|
||||
|
||||
@@ -50,7 +50,7 @@ inputs:
|
||||
default: "false"
|
||||
trivy-image:
|
||||
description: Trivy container image, pinned by digest.
|
||||
default: aquasec/trivy:0.75.0@sha256:af6acf9a6b85dfe389a1941505c0ce9efef52a4719635e1a962f022a3d855daa
|
||||
default: aquasec/trivy:0.76.2@sha256:8f6bb947dbc528902e11f2f5be52f7b519f6a39d5d148f41166f2040499768fb
|
||||
cache-volume:
|
||||
description: >
|
||||
Docker named volume for the vulnerability DB. A named volume, not a
|
||||
@@ -77,9 +77,9 @@ runs:
|
||||
SCAN_REF: ${{ inputs.scan-ref }}
|
||||
RUNTIME: ${{ inputs.runtime }}
|
||||
SCANNERS: ${{ inputs.scanners }}
|
||||
TRIVY_VERSION: "0.75.0"
|
||||
TRIVY_SHA256_AMD64: c6e65abddb348e25f10549df887045629cf28cc72453cd1c63acb717316b3f3f
|
||||
TRIVY_SHA256_ARM64: a1ee9f6ffb7d112b64ff726a2a0717c21175c1114361391f4a132956751a13b3
|
||||
TRIVY_VERSION: "0.76.2"
|
||||
TRIVY_SHA256_AMD64: bc0fc726e017b8927a62b2d3531d7a84ee01769daf5c99ed866dced54089fdbf
|
||||
TRIVY_SHA256_ARM64: ab9d51f86e6a5fb936f605faff6b593ac51bc378fff4d3e8b9d58358b9c367c3
|
||||
TRIVY_USERNAME: ${{ inputs.username }}
|
||||
TRIVY_PASSWORD: ${{ inputs.password }}
|
||||
PLATFORM: ${{ inputs.platform }}
|
||||
|
||||
Reference in new issue
Block a user