6 Commits
v4 .. v7
Author SHA1 Message Date
renovate-bot ade9877f07 Merge pull request 'Update trivy to v0.76.1' (#1) from renovate/trivy into main
tag / tag (push) Successful in 4s
2026-10-26 17:40:45 +01:00
renovate-bot 371eedc0ef Update trivy to v0.76.1
pr-check / docker (pull_request) Successful in 11s
pr-check / binary (pull_request) Successful in 42s
2026-10-26 16:39:59 +00:00
renovate-bot 2656687937 Merge pull request 'Update actions/checkout action to v7' (#2) from renovate/major-ci-actions into main
tag / tag (push) Successful in 4s
2026-10-26 16:46:57 +01:00
renovate-bot 6a93557620 Update actions/checkout action to v7
pr-check / docker (pull_request) Successful in 11s
pr-check / binary (pull_request) Successful in 56s
2026-10-26 15:45:53 +00:00
tthandClaude Opus 5.5 632d2d7465 Renovate-maintained tool pins: checksum script, PR check, auto tag
tag / tag (push) Skipped
Trivy and gitleaks were pinned (version + tarball SHA-256 + image
digest) with nothing to bump them. Renovate (tth/renovate) now does;
.gitea/update-checksums.sh recomputes the SHA-256s after a bump and
checks them against the release checksums file; pr-check.yml runs the
PR's actions with the Trivy container and with the pinned binary
(checksum verified); tag.yml cuts the next vN after renovate-bot's merge.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 15:18:29 +01:00
tthandClaude Opus 5.5 380988c194 portainer-deploy: content-addressed Swarm configs from repo files (v5)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 14:24:36 +01:00
7 changed files with 293 additions and 74 deletions

No files matched your search

+47
View File
@@ -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
+58
View File
@@ -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:24-trixie-slim@sha256:43b9ba1142b8dcf33fa8f922ca1be85714adc444e0586c7cf7726daaeabc1bea
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
+31
View File
@@ -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)"
+26 -1
View File
@@ -105,6 +105,14 @@ binary is verified by SHA-256.
`v3` gitleaks fetches the parent of a single commit in a depth-1 checkout `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). (dispatch/cron runs scanned the whole tree as a root commit before).
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 ## portainer-deploy
Updates a Portainer Swarm stack from a compose file in the repository - the Updates a Portainer Swarm stack from a compose file in the repository - the
@@ -115,7 +123,7 @@ live) are kept and never logged; only `vars` are overwritten. Images are
re-pulled (`pullImage`). re-pulled (`pullImage`).
```yaml ```yaml
- uses: https://git.rfa.cz/tth-pub/ci-actions/portainer-deploy@v4 - uses: https://git.rfa.cz/tth-pub/ci-actions/portainer-deploy@v5
with: with:
url: ${{ secrets.PORTAINER_URL }} url: ${{ secrets.PORTAINER_URL }}
token: ${{ secrets.PORTAINER_TOKEN }} token: ${{ secrets.PORTAINER_TOKEN }}
@@ -128,6 +136,23 @@ re-pulled (`pullImage`).
smoke-timeout: "180" smoke-timeout: "180"
``` ```
Config files from the repo can ride along as Swarm configs. Each becomes a
config named after its content hash, created when missing; the stack
variable points at it, so a changed file rolls the services that mount it,
and superseded versions are removed once nothing uses them:
```yaml
configs: |
CFG_NGINX=deploy/nginx.conf
config-prefix: myapp_
```
```yaml
# compose
configs:
nginx_conf: {external: true, name: "${CFG_NGINX}"}
```
Pin images in the compose file to the variable (`image: …:${IMAGE_TAG}`), so Pin images in the compose file to the variable (`image: …:${IMAGE_TAG}`), so
the deployed version is the commit that passed the gate, not whatever the deployed version is the commit that passed the gate, not whatever
`latest` points at when Swarm pulls. `latest` points at when Swarm pulls.
+1 -1
View File
@@ -32,7 +32,7 @@ inputs:
default: "5" default: "5"
trivy-image: trivy-image:
description: Trivy container image, pinned by digest. description: Trivy container image, pinned by digest.
default: aquasec/trivy:0.75.0@sha256:af6acf9a6b85dfe389a1941505c0ce9efef52a4719635e1a962f022a3d855daa default: aquasec/trivy:0.76.1@sha256:790fd66d1697395d8693d1acaa1ea702406a20f109b6fc7bac8db623eca6c06c
runs: runs:
using: composite using: composite
+126 -68
View File
@@ -4,7 +4,8 @@ description: >
compose file is the single source of truth: Portainer's stored compose is compose file 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 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. kept and only the given variables are overwritten. Images are re-pulled.
Optionally waits until a URL answers with the expected status. Config files from the repo can be shipped as content-addressed Swarm
configs. Optionally waits until a URL answers with the expected status.
inputs: inputs:
url: url:
@@ -29,6 +30,19 @@ inputs:
Stack variables to set, one NAME=value per line (e.g. IMAGE_TAG=sha-1234abcd). Stack variables to set, one NAME=value per line (e.g. IMAGE_TAG=sha-1234abcd).
Every other stack variable is kept as it is. Every other stack variable is kept as it is.
default: "" default: ""
configs:
description: >
Files shipped as Swarm configs, one VAR=path per line. Each file becomes
a config named <config-prefix><var>-<sha256[:12] of the content>
(created when missing) and the stack variable VAR is set to that name,
so the compose file references it as
`{external: true, name: "${VAR}"}`. A changed file = a new config =
the service is updated; older versions of the same VAR are removed once
no service uses them.
default: ""
config-prefix:
description: Prefix of the config names (e.g. the stack name and an underscore).
default: ""
prune: prune:
description: Remove services that are no longer in the compose file. description: Remove services that are no longer in the compose file.
default: "false" default: "false"
@@ -53,6 +67,8 @@ runs:
COMPOSE_FILE: ${{ inputs.compose-file }} COMPOSE_FILE: ${{ inputs.compose-file }}
ENDPOINT_ID: ${{ inputs.endpoint-id }} ENDPOINT_ID: ${{ inputs.endpoint-id }}
SET_VARS: ${{ inputs.vars }} SET_VARS: ${{ inputs.vars }}
CONFIGS: ${{ inputs.configs }}
CONFIG_PREFIX: ${{ inputs.config-prefix }}
PRUNE: ${{ inputs.prune }} PRUNE: ${{ inputs.prune }}
SMOKE_URL: ${{ inputs.smoke-url }} SMOKE_URL: ${{ inputs.smoke-url }}
SMOKE_STATUS: ${{ inputs.smoke-status }} SMOKE_STATUS: ${{ inputs.smoke-status }}
@@ -63,73 +79,115 @@ runs:
echo "::notice::portainer-deploy: no stack id, deploy skipped" echo "::notice::portainer-deploy: no stack id, deploy skipped"
exit 0 exit 0
fi fi
: "${PORTAINER_URL:?url input is empty}" "${PORTAINER_TOKEN:?token input is empty}" # The stack env carries the secrets: it only ever lives in this
[ -f "$COMPOSE_FILE" ] || { echo "::error::compose file $COMPOSE_FILE not found"; exit 1; } # process's memory, between the GET and the PUT, never in the log.
work="${RUNNER_TEMP:-/tmp}/portainer-deploy"; mkdir -p "$work"; chmod 700 "$work" python3 - <<'PY'
trap 'rm -rf "$work"' EXIT import base64, hashlib, json, os, ssl, sys, time, urllib.error, urllib.parse, urllib.request
base="${PORTAINER_URL%/}"
# The stack body carries the env (secrets): it goes from this GET into E = os.environ
# the PUT body through a private temp file and never to the log. base = E["PORTAINER_URL"].rstrip("/")
code=$(curl -sS -o "$work/stack.json" -w '%{http_code}' \ token = E["PORTAINER_TOKEN"]
-H "X-API-Key: $PORTAINER_TOKEN" "$base/api/stacks/$STACK_ID") || code=000 stack_id, endpoint = E["STACK_ID"], E.get("ENDPOINT_ID") or "1"
if [ "$code" != 200 ]; then if not base or not token:
echo "::error::Portainer GET /api/stacks/$STACK_ID returned HTTP $code" sys.exit("::error::portainer-deploy: url and token are required")
exit 1
fi
python3 - "$work/stack.json" "$COMPOSE_FILE" "$work/body.json" <<'PY' def api(method, path, body=None, ok=(200,)):
import json, os, sys req = urllib.request.Request(base + path, method=method,
stack_path, compose_path, out_path = sys.argv[1:] headers={"X-API-Key": token, "Content-Type": "application/json"},
with open(stack_path) as f: data=None if body is None else json.dumps(body).encode())
stack = json.load(f) try:
sets = {} with urllib.request.urlopen(req, timeout=120) as r:
for line in os.environ.get("SET_VARS", "").splitlines(): status, raw = r.status, r.read()
line = line.strip() except urllib.error.HTTPError as e:
if not line: status, raw = e.code, e.read()
continue if status not in ok:
name, sep, value = line.partition("=") raise RuntimeError(f"{method} {path.split('?')[0]} -> HTTP {status}: {raw[:300].decode(errors='replace')}")
if not sep or not name: return status, (json.loads(raw) if raw.strip() else None)
sys.exit(f"portainer-deploy: bad vars line (want NAME=value): {name!r}")
sets[name.strip()] = value def lines(name):
env = [e for e in (stack.get("Env") or []) if e.get("name") not in sets] out = {}
env += [{"name": k, "value": v} for k, v in sets.items()] for line in E.get(name, "").splitlines():
with open(compose_path) as f: line = line.strip()
compose = f.read() if not line:
body = { continue
"stackFileContent": compose, key, sep, value = line.partition("=")
"env": env, if not sep or not key.strip():
"prune": os.environ.get("PRUNE", "false").lower() == "true", sys.exit(f"::error::portainer-deploy: bad {name.lower()} line (want NAME=value): {key!r}")
"pullImage": True, out[key.strip()] = value.strip() if name == "CONFIGS" else value
} return out
fd = os.open(out_path, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o600)
with os.fdopen(fd, "w") as f: try:
json.dump(body, f) sets = lines("SET_VARS")
kept = len(env) - len(sets) docker = f"/api/endpoints/{endpoint}/docker"
print(f"stack {stack.get('Name', '?')}: setting {', '.join(f'{k}={v}' for k, v in sets.items()) or 'nothing'}; {kept} other variable(s) kept")
# Content-addressed configs: the name changes with the content, so
# a changed file rolls the services that mount it.
prefix = E.get("CONFIG_PREFIX", "")
stale = []
for var, path in lines("CONFIGS").items():
with open(path, "rb") as f:
data = f.read()
stem = f"{prefix}{var.lower()}"
name = f"{stem}-{hashlib.sha256(data).hexdigest()[:12]}"
flt = urllib.parse.quote(json.dumps({"label": [f"portainer-deploy.config={stem}"]}))
_, existing = api("GET", f"{docker}/configs?filters={flt}")
names = {c["Spec"]["Name"]: c["ID"] for c in existing or []}
if name in names:
print(f"config {name} ({path}) unchanged")
else:
api("POST", f"{docker}/configs/create", {
"Name": name,
"Data": base64.b64encode(data).decode(),
"Labels": {"portainer-deploy.config": stem},
}, ok=(200, 201))
print(f"config {name} created from {path}")
stale += [(n, i) for n, i in names.items() if n != name]
sets[var] = name
_, stack = api("GET", f"/api/stacks/{stack_id}")
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()]
with open(E["COMPOSE_FILE"]) as f:
compose = f.read()
api("PUT", f"/api/stacks/{stack_id}?endpointId={endpoint}", {
"stackFileContent": compose,
"env": env,
"prune": E.get("PRUNE", "false").lower() == "true",
"pullImage": True,
})
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")
# 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.
for name, cid in stale:
try:
api("DELETE", f"{docker}/configs/{cid}", ok=(200, 204))
print(f"config {name} removed (superseded)")
except RuntimeError:
print(f"config {name} still in use, kept for the next deploy")
except (RuntimeError, OSError) as exc:
sys.exit(f"::error::portainer-deploy: {exc}")
url = E.get("SMOKE_URL", "")
if url:
want, deadline = E.get("SMOKE_STATUS", "200"), time.time() + float(E.get("SMOKE_TIMEOUT") or 180)
ctx = ssl.create_default_context()
ctx.check_hostname, ctx.verify_mode = False, ssl.CERT_NONE
while True:
try:
with urllib.request.urlopen(url, timeout=10, context=ctx) as r:
got = str(r.status)
except urllib.error.HTTPError as e:
got = str(e.code)
except (urllib.error.URLError, OSError):
got = "000"
if got == want:
print(f"smoke: {url} answered {got}")
break
if time.time() >= deadline:
sys.exit(f"::error::smoke: {url} answered {got}, expected {want}")
time.sleep(10)
PY PY
code=$(curl -sS -o "$work/resp.json" -w '%{http_code}' -X PUT \
"$base/api/stacks/$STACK_ID?endpointId=$ENDPOINT_ID" \
-H "X-API-Key: $PORTAINER_TOKEN" -H "Content-Type: application/json" \
--data-binary "@$work/body.json") || code=000
if [ "$code" != 200 ]; then
echo "::error::Portainer stack PUT returned HTTP $code: $(head -c 300 "$work/resp.json" 2>/dev/null)"
exit 1
fi
echo "stack $STACK_ID updated from $COMPOSE_FILE"
[ -n "$SMOKE_URL" ] || exit 0
deadline=$(( $(date +%s) + SMOKE_TIMEOUT ))
while :; do
got=$(curl -sk -o /dev/null -w '%{http_code}' --max-time 10 "$SMOKE_URL" 2>/dev/null) || got=000
if [ "$got" = "$SMOKE_STATUS" ]; then
echo "smoke: $SMOKE_URL answered $got"
break
fi
if [ "$(date +%s)" -ge "$deadline" ]; then
echo "::error::smoke: $SMOKE_URL answered $got, expected $SMOKE_STATUS (waited ${SMOKE_TIMEOUT}s)"
exit 1
fi
sleep 10
done
+4 -4
View File
@@ -50,7 +50,7 @@ inputs:
default: "false" default: "false"
trivy-image: trivy-image:
description: Trivy container image, pinned by digest. description: Trivy container image, pinned by digest.
default: aquasec/trivy:0.75.0@sha256:af6acf9a6b85dfe389a1941505c0ce9efef52a4719635e1a962f022a3d855daa default: aquasec/trivy:0.76.1@sha256:790fd66d1697395d8693d1acaa1ea702406a20f109b6fc7bac8db623eca6c06c
cache-volume: cache-volume:
description: > description: >
Docker named volume for the vulnerability DB. A named volume, not a Docker named volume for the vulnerability DB. A named volume, not a
@@ -77,9 +77,9 @@ runs:
SCAN_REF: ${{ inputs.scan-ref }} SCAN_REF: ${{ inputs.scan-ref }}
RUNTIME: ${{ inputs.runtime }} RUNTIME: ${{ inputs.runtime }}
SCANNERS: ${{ inputs.scanners }} SCANNERS: ${{ inputs.scanners }}
TRIVY_VERSION: "0.75.0" TRIVY_VERSION: "0.76.1"
TRIVY_SHA256_AMD64: c6e65abddb348e25f10549df887045629cf28cc72453cd1c63acb717316b3f3f TRIVY_SHA256_AMD64: c7cbe3137fb8a48a17574bede3dd6beb16742d1e9772929940fc90082c39d9c0
TRIVY_SHA256_ARM64: a1ee9f6ffb7d112b64ff726a2a0717c21175c1114361391f4a132956751a13b3 TRIVY_SHA256_ARM64: e174dff2a6dba5e3ae41f8d0537a6324405bd08132497340304c6b20e0f16a1f
TRIVY_USERNAME: ${{ inputs.username }} TRIVY_USERNAME: ${{ inputs.username }}
TRIVY_PASSWORD: ${{ inputs.password }} TRIVY_PASSWORD: ${{ inputs.password }}
PLATFORM: ${{ inputs.platform }} PLATFORM: ${{ inputs.platform }}