Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2656687937 | ||
|
|
6a93557620 | ||
|
|
632d2d7465 | ||
|
|
380988c194 |
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: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
|
||||
@@ -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)"
|
||||
@@ -105,6 +105,14 @@ binary is verified by SHA-256.
|
||||
`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
|
||||
@@ -115,7 +123,7 @@ 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@v4
|
||||
- uses: https://git.rfa.cz/tth-pub/ci-actions/portainer-deploy@v5
|
||||
with:
|
||||
url: ${{ secrets.PORTAINER_URL }}
|
||||
token: ${{ secrets.PORTAINER_TOKEN }}
|
||||
@@ -128,6 +136,23 @@ re-pulled (`pullImage`).
|
||||
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.
|
||||
|
||||
+126
-68
@@ -4,7 +4,8 @@ description: >
|
||||
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.
|
||||
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:
|
||||
url:
|
||||
@@ -29,6 +30,19 @@ inputs:
|
||||
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"
|
||||
@@ -53,6 +67,8 @@ runs:
|
||||
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 }}
|
||||
@@ -63,73 +79,115 @@ runs:
|
||||
echo "::notice::portainer-deploy: no stack id, deploy skipped"
|
||||
exit 0
|
||||
fi
|
||||
: "${PORTAINER_URL:?url input is empty}" "${PORTAINER_TOKEN:?token input is empty}"
|
||||
[ -f "$COMPOSE_FILE" ] || { echo "::error::compose file $COMPOSE_FILE not found"; exit 1; }
|
||||
work="${RUNNER_TEMP:-/tmp}/portainer-deploy"; mkdir -p "$work"; chmod 700 "$work"
|
||||
trap 'rm -rf "$work"' EXIT
|
||||
base="${PORTAINER_URL%/}"
|
||||
# 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
|
||||
|
||||
# The stack body carries the env (secrets): it goes from this GET into
|
||||
# the PUT body through a private temp file and never to the log.
|
||||
code=$(curl -sS -o "$work/stack.json" -w '%{http_code}' \
|
||||
-H "X-API-Key: $PORTAINER_TOKEN" "$base/api/stacks/$STACK_ID") || code=000
|
||||
if [ "$code" != 200 ]; then
|
||||
echo "::error::Portainer GET /api/stacks/$STACK_ID returned HTTP $code"
|
||||
exit 1
|
||||
fi
|
||||
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")
|
||||
|
||||
python3 - "$work/stack.json" "$COMPOSE_FILE" "$work/body.json" <<'PY'
|
||||
import json, os, sys
|
||||
stack_path, compose_path, out_path = sys.argv[1:]
|
||||
with open(stack_path) as f:
|
||||
stack = json.load(f)
|
||||
sets = {}
|
||||
for line in os.environ.get("SET_VARS", "").splitlines():
|
||||
line = line.strip()
|
||||
if not line:
|
||||
continue
|
||||
name, sep, value = line.partition("=")
|
||||
if not sep or not name:
|
||||
sys.exit(f"portainer-deploy: bad vars line (want NAME=value): {name!r}")
|
||||
sets[name.strip()] = value
|
||||
env = [e for e in (stack.get("Env") or []) if e.get("name") not in sets]
|
||||
env += [{"name": k, "value": v} for k, v in sets.items()]
|
||||
with open(compose_path) as f:
|
||||
compose = f.read()
|
||||
body = {
|
||||
"stackFileContent": compose,
|
||||
"env": env,
|
||||
"prune": os.environ.get("PRUNE", "false").lower() == "true",
|
||||
"pullImage": True,
|
||||
}
|
||||
fd = os.open(out_path, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o600)
|
||||
with os.fdopen(fd, "w") as f:
|
||||
json.dump(body, f)
|
||||
kept = len(env) - len(sets)
|
||||
print(f"stack {stack.get('Name', '?')}: setting {', '.join(f'{k}={v}' for k, v in sets.items()) or 'nothing'}; {kept} other variable(s) kept")
|
||||
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
|
||||
|
||||
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
|
||||
Reference in new issue
Block a user