5 Commits
v3 .. v6
Author SHA1 Message Date
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
tthandClaude Opus 5.5 a3c4ae5edf portainer-deploy: update a Swarm stack from the repo's compose file (v4)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 14:20:28 +01:00
5 changed files with 382 additions and 0 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)"
+53
View File
@@ -104,3 +104,56 @@ 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).
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
Updates a Portainer Swarm stack from a compose file in the repository - the
last step of the build → `trivy-gate` → move `latest` → deploy pipeline. The
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`).
```yaml
- uses: https://git.rfa.cz/tth-pub/ci-actions/portainer-deploy@v5
with:
url: ${{ secrets.PORTAINER_URL }}
token: ${{ secrets.PORTAINER_TOKEN }}
stack-id: ${{ secrets.PORTAINER_STACK_ID }} # empty = skip with a notice
compose-file: docker-compose.swarm.yml
vars: |
IMAGE_TAG=sha-${{ steps.build.outputs.sha }}
smoke-url: https://app.example.org/health # optional
smoke-status: "200"
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
the deployed version is the commit that passed the gate, not whatever
`latest` points at when Swarm pulls.
+193
View File
@@ -0,0 +1,193 @@
name: portainer-deploy
description: >
Update a Portainer Swarm stack from a compose file in the repository. The
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
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.
inputs:
url:
description: Portainer base URL.
required: true
token:
description: Portainer API key (X-API-Key).
required: true
stack-id:
description: >
Portainer stack id. Empty = skip the deploy with a notice (a repo that
has no stack yet).
default: ""
compose-file:
description: Compose file in the checkout to deploy.
required: true
endpoint-id:
description: Portainer environment (endpoint) id.
default: "1"
vars:
description: >
Stack variables to set, one NAME=value per line (e.g. IMAGE_TAG=sha-1234abcd).
Every other stack variable is kept as it is.
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:
description: Remove services that are no longer in the compose file.
default: "false"
smoke-url:
description: URL polled after the deploy until it answers smoke-status. Empty = no check.
default: ""
smoke-status:
description: Expected HTTP status of smoke-url.
default: "200"
smoke-timeout:
description: Seconds to wait for smoke-url.
default: "180"
runs:
using: composite
steps:
- shell: bash
env:
PORTAINER_URL: ${{ inputs.url }}
PORTAINER_TOKEN: ${{ inputs.token }}
STACK_ID: ${{ inputs.stack-id }}
COMPOSE_FILE: ${{ inputs.compose-file }}
ENDPOINT_ID: ${{ inputs.endpoint-id }}
SET_VARS: ${{ inputs.vars }}
CONFIGS: ${{ inputs.configs }}
CONFIG_PREFIX: ${{ inputs.config-prefix }}
PRUNE: ${{ inputs.prune }}
SMOKE_URL: ${{ inputs.smoke-url }}
SMOKE_STATUS: ${{ inputs.smoke-status }}
SMOKE_TIMEOUT: ${{ inputs.smoke-timeout }}
run: |
set -euo pipefail
if [ -z "$STACK_ID" ]; then
echo "::notice::portainer-deploy: no stack id, deploy skipped"
exit 0
fi
# The stack env carries the secrets: it only ever lives in this
# process's memory, between the GET and the PUT, never in the log.
python3 - <<'PY'
import base64, hashlib, json, os, ssl, sys, time, urllib.error, urllib.parse, urllib.request
E = os.environ
base = E["PORTAINER_URL"].rstrip("/")
token = E["PORTAINER_TOKEN"]
stack_id, endpoint = E["STACK_ID"], E.get("ENDPOINT_ID") or "1"
if not base or not token:
sys.exit("::error::portainer-deploy: url and token are required")
def api(method, path, body=None, ok=(200,)):
req = urllib.request.Request(base + path, method=method,
headers={"X-API-Key": token, "Content-Type": "application/json"},
data=None if body is None else json.dumps(body).encode())
try:
with urllib.request.urlopen(req, timeout=120) as r:
status, raw = r.status, r.read()
except urllib.error.HTTPError as e:
status, raw = e.code, e.read()
if status not in ok:
raise RuntimeError(f"{method} {path.split('?')[0]} -> HTTP {status}: {raw[:300].decode(errors='replace')}")
return status, (json.loads(raw) if raw.strip() else None)
def lines(name):
out = {}
for line in E.get(name, "").splitlines():
line = line.strip()
if not line:
continue
key, sep, value = line.partition("=")
if not sep or not key.strip():
sys.exit(f"::error::portainer-deploy: bad {name.lower()} line (want NAME=value): {key!r}")
out[key.strip()] = value.strip() if name == "CONFIGS" else value
return out
try:
sets = lines("SET_VARS")
docker = f"/api/endpoints/{endpoint}/docker"
# 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