Compare commits
29
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe9d9fe181 | ||
|
|
40f62c2b64 | ||
|
|
d792a6549b | ||
|
|
ea219b4adf | ||
|
|
95cced5144 | ||
|
|
01ac98d677 | ||
|
|
2b308e9192 | ||
|
|
b5bb46740d | ||
|
|
4e657304c5 | ||
|
|
01741e735a | ||
|
|
1c9b0edeca | ||
|
|
541c565947 | ||
|
|
adf74e2f69 | ||
|
|
8a6a6d7b44 | ||
|
|
4b35869477 | ||
|
|
ad66667053 | ||
|
|
e7d4db5bd3 | ||
|
|
0fee1b54c4 | ||
|
|
9baa7a6029 | ||
|
|
3a6cab19ee | ||
|
|
6a11fc9894 | ||
|
|
05ad47a833 | ||
|
|
d1547f3418 | ||
|
|
a00a3c7fc3 | ||
|
|
3334f94cd5 | ||
|
|
76fc53358c | ||
|
|
fc60ac5ef3 | ||
|
|
472fdcbc4d | ||
|
|
cb0cecb557 |
No files matched your search
Executable
+84
@@ -0,0 +1,84 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## plan-legs.sh - decide which image legs of build-push.yaml run.
|
||||||
|
##
|
||||||
|
## Env:
|
||||||
|
## ONLY workflow_dispatch input "only". Empty/blank (and every push
|
||||||
|
## event) = build everything, exactly as before.
|
||||||
|
## GITHUB_OUTPUT file the outputs are appended to (set by the runner).
|
||||||
|
##
|
||||||
|
## ONLY is a comma list of tokens (spaces ignored):
|
||||||
|
## cac:php85 cac-fpm:php84 cac-litespeed:php83 cac-lsphp:php82 one leg
|
||||||
|
## cac | cac-fpm | cac-litespeed | cac-lsphp every PHP version of that image
|
||||||
|
## shared-httpd | shared-ols that image
|
||||||
|
## Any other token is an error (exit 2, nothing is written): a typo must fail
|
||||||
|
## the plan job loudly, never silently build nothing.
|
||||||
|
##
|
||||||
|
## Outputs (matrix families = JSON array of phpver, [] = skip the job;
|
||||||
|
## single-leg images = true|false):
|
||||||
|
## cac cac_fpm cac_litespeed cac_lsphp shared_httpd shared_ols
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
MATRIX_FAMILIES=(cac cac-fpm cac-litespeed cac-lsphp)
|
||||||
|
SINGLE_FAMILIES=(shared-httpd shared-ols)
|
||||||
|
ALL_PHPVER=(82 83 84 85)
|
||||||
|
|
||||||
|
die() { echo "plan-legs: $*" >&2; exit 2; }
|
||||||
|
|
||||||
|
only=${ONLY-}
|
||||||
|
only=${only//[[:space:]]/}
|
||||||
|
|
||||||
|
declare -A want_ver want_single
|
||||||
|
want_all=false
|
||||||
|
|
||||||
|
if [ -z "$only" ]; then
|
||||||
|
want_all=true
|
||||||
|
else
|
||||||
|
n=0
|
||||||
|
IFS=',' read -r -a toks <<< "$only"
|
||||||
|
for t in "${toks[@]}"; do
|
||||||
|
[ -n "$t" ] || continue
|
||||||
|
n=$((n + 1))
|
||||||
|
fam=${t%%:*}
|
||||||
|
ver=""
|
||||||
|
if [ "$fam" != "$t" ]; then
|
||||||
|
ver=${t#*:}
|
||||||
|
[ -n "$ver" ] || die "empty PHP version in '$t'"
|
||||||
|
fi
|
||||||
|
if [[ " ${MATRIX_FAMILIES[*]} " == *" $fam "* ]]; then
|
||||||
|
if [ -z "$ver" ]; then
|
||||||
|
for v in "${ALL_PHPVER[@]}"; do want_ver["$fam:$v"]=1; done
|
||||||
|
elif [[ "$ver" =~ ^php(8[2-5])$ ]]; then
|
||||||
|
want_ver["$fam:${BASH_REMATCH[1]}"]=1
|
||||||
|
else
|
||||||
|
die "unknown PHP version in '$t' (want ${fam}:php82 .. ${fam}:php85)"
|
||||||
|
fi
|
||||||
|
elif [[ " ${SINGLE_FAMILIES[*]} " == *" $fam "* ]]; then
|
||||||
|
[ "$fam" = "$t" ] || die "'$t': $fam has a single leg, use plain '$fam'"
|
||||||
|
want_single["$fam"]=1
|
||||||
|
else
|
||||||
|
die "unknown image '$t' (known: ${MATRIX_FAMILIES[*]} ${SINGLE_FAMILIES[*]})"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
[ "$n" -gt 0 ] || die "'only' has no usable entries: '$only'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
matrix_json() { # family
|
||||||
|
local fam=$1 v out=""
|
||||||
|
for v in "${ALL_PHPVER[@]}"; do
|
||||||
|
if $want_all || [ -n "${want_ver["$fam:$v"]-}" ]; then out+="${out:+,}$v"; fi
|
||||||
|
done
|
||||||
|
printf '[%s]' "$out"
|
||||||
|
}
|
||||||
|
single_json() { # family
|
||||||
|
if $want_all || [ -n "${want_single["$1"]-}" ]; then echo true; else echo false; fi
|
||||||
|
}
|
||||||
|
|
||||||
|
out=${GITHUB_OUTPUT:-/dev/stdout}
|
||||||
|
{
|
||||||
|
echo "cac=$(matrix_json cac)"
|
||||||
|
echo "cac_fpm=$(matrix_json cac-fpm)"
|
||||||
|
echo "cac_litespeed=$(matrix_json cac-litespeed)"
|
||||||
|
echo "cac_lsphp=$(matrix_json cac-lsphp)"
|
||||||
|
echo "shared_httpd=$(single_json shared-httpd)"
|
||||||
|
echo "shared_ols=$(single_json shared-ols)"
|
||||||
|
} >> "$out"
|
||||||
Executable
+35
@@ -0,0 +1,35 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
## resolve-base-image.sh IMAGE:TAG — CI only (not copied into images).
|
||||||
|
## Prints IMAGE@sha256:<digest> for a Docker Hub tag, looked up DIRECTLY at
|
||||||
|
## registry-1.docker.io over HTTPS (never via the pkg-cache mirror), so the
|
||||||
|
## build can say `FROM IMAGE@sha256:...` and the mirror can only serve
|
||||||
|
## content-addressed blobs that BuildKit verifies. Exits non-zero (prints
|
||||||
|
## nothing on stdout) if the lookup fails; the workflow then skips the mirror
|
||||||
|
## and pulls the tag directly from Docker Hub. HEAD requests do not count
|
||||||
|
## against Docker Hub pull rate limits.
|
||||||
|
## Canonical copy: cloud-apache-container/.gitea/scripts/resolve-base-image.sh
|
||||||
|
## (docs/pkg-cache.md there); other repos carry identical copies.
|
||||||
|
set -euo pipefail
|
||||||
|
ref="${1:?usage: resolve-base-image.sh IMAGE:TAG}"
|
||||||
|
name_re='^[a-z0-9]+([._-][a-z0-9]+)*(/[a-z0-9]+([._-][a-z0-9]+)*)?$'
|
||||||
|
tag_re='^[A-Za-z0-9_][A-Za-z0-9_.-]{0,127}$'
|
||||||
|
name="${ref%:*}"; tag="${ref##*:}"
|
||||||
|
[ "$name" != "$ref" ] || { echo "resolve-base-image: '$ref' has no :tag" >&2; exit 2; }
|
||||||
|
[[ "$name" =~ $name_re ]] || { echo "resolve-base-image: bad image name '$name'" >&2; exit 2; }
|
||||||
|
[[ "$tag" =~ $tag_re ]] || { echo "resolve-base-image: bad tag '$tag'" >&2; exit 2; }
|
||||||
|
repo="$name"; [[ "$repo" == */* ]] || repo="library/$repo" # official images
|
||||||
|
|
||||||
|
curl_opts=(-fsS --proto '=https' --retry 3 --retry-all-errors --max-time 20)
|
||||||
|
token=$(curl "${curl_opts[@]}" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:${repo}:pull" |
|
||||||
|
python3 -c 'import json,sys; print(json.load(sys.stdin)["token"])')
|
||||||
|
[ -n "$token" ] || { echo "resolve-base-image: no Docker Hub token for $repo" >&2; exit 1; }
|
||||||
|
hdrs=$(curl "${curl_opts[@]}" -I \
|
||||||
|
-H "Authorization: Bearer ${token}" \
|
||||||
|
-H 'Accept: application/vnd.oci.image.index.v1+json' \
|
||||||
|
-H 'Accept: application/vnd.docker.distribution.manifest.list.v2+json' \
|
||||||
|
-H 'Accept: application/vnd.oci.image.manifest.v1+json' \
|
||||||
|
-H 'Accept: application/vnd.docker.distribution.manifest.v2+json' \
|
||||||
|
"https://registry-1.docker.io/v2/${repo}/manifests/${tag}")
|
||||||
|
digest=$(printf '%s\n' "$hdrs" | tr -d '\r' | awk 'tolower($1)=="docker-content-digest:" {print $2}' | tail -n1)
|
||||||
|
[[ "$digest" =~ ^sha256:[0-9a-f]{64}$ ]] || { echo "resolve-base-image: no valid digest for $ref (got '${digest}')" >&2; exit 1; }
|
||||||
|
printf '%s@%s\n' "$name" "$digest"
|
||||||
@@ -1,10 +1,22 @@
|
|||||||
name: Cloud Apache Container
|
name: Cloud Apache Container
|
||||||
run-name: ${{ gitea.actor }} pushed a change to trunk
|
run-name: ${{ gitea.actor }} pushed a change to trunk
|
||||||
|
# Manual run. `only` (optional) rebuilds just the named legs instead of every
|
||||||
|
# image: Gitea cannot re-run a single job and a full run takes ~1h.
|
||||||
|
# Syntax: comma list of cac:php85, cac-fpm:php84, cac-litespeed:php83,
|
||||||
|
# cac-lsphp:php82, shared-httpd, shared-ols; a bare family name (cac) = all its
|
||||||
|
# PHP versions. Empty = everything (same as a push). Unknown values fail the
|
||||||
|
# plan job. See .gitea/scripts/plan-legs.sh.
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- trunk
|
- trunk
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
only:
|
||||||
|
description: 'Only build these legs (comma list, e.g. cac:php85 or cac-fpm:php84,shared-httpd). Empty = build everything.'
|
||||||
|
required: false
|
||||||
|
default: ''
|
||||||
|
type: string
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# Shell gate. Runs FIRST and costs seconds; the images below do not depend on
|
# Shell gate. Runs FIRST and costs seconds; the images below do not depend on
|
||||||
@@ -52,12 +64,45 @@ jobs:
|
|||||||
scripts/create-vhost-litespeed.sh \
|
scripts/create-vhost-litespeed.sh \
|
||||||
scripts/install-lscache-wp.sh \
|
scripts/install-lscache-wp.sh \
|
||||||
scripts/lsphp-apt-upgrade.sh \
|
scripts/lsphp-apt-upgrade.sh \
|
||||||
|
scripts/lsphp-pin-resolve.sh \
|
||||||
|
scripts/tests/lsphp-pin-resolve.test.sh \
|
||||||
scripts/lsphp-src-build.sh \
|
scripts/lsphp-src-build.sh \
|
||||||
scripts/lsphp-src-overlay.sh \
|
scripts/lsphp-src-overlay.sh \
|
||||||
scripts/lsphp-abi-gate.sh \
|
scripts/lsphp-abi-gate.sh \
|
||||||
scripts/tune-mpm.sh \
|
scripts/tune-mpm.sh \
|
||||||
|
scripts/httpd-h2-md-gate.sh \
|
||||||
scripts/tests/lsphp-info-probe.test.sh \
|
scripts/tests/lsphp-info-probe.test.sh \
|
||||||
scripts/tests/lsphp-abi-gate.test.sh
|
scripts/lsphp-repo-version.sh \
|
||||||
|
scripts/tests/lsphp-repo-version.test.sh \
|
||||||
|
scripts/image-label-amd64.sh \
|
||||||
|
scripts/php-emergency-guard.sh \
|
||||||
|
scripts/index-platforms.sh \
|
||||||
|
scripts/assemble-multiarch-index.sh \
|
||||||
|
scripts/tests/image-label-amd64.test.sh \
|
||||||
|
scripts/tests/index-platforms.test.sh \
|
||||||
|
scripts/tests/lsphp-abi-gate.test.sh \
|
||||||
|
scripts/tests/lsphp-src-upload-progress.test.sh \
|
||||||
|
.gitea/scripts/resolve-base-image.sh \
|
||||||
|
.gitea/scripts/plan-legs.sh
|
||||||
|
|
||||||
|
- name: lsphp pin-resolve fixture test
|
||||||
|
run: ./scripts/tests/lsphp-pin-resolve.test.sh
|
||||||
|
|
||||||
|
- name: lsphp repo-version lookup test
|
||||||
|
run: ./scripts/tests/lsphp-repo-version.test.sh
|
||||||
|
|
||||||
|
- name: multi-arch guard tests (index-safe label read, fail-closed, assemble rules)
|
||||||
|
run: |
|
||||||
|
./scripts/tests/image-label-amd64.test.sh
|
||||||
|
./scripts/tests/index-platforms.test.sh
|
||||||
|
|
||||||
|
# Static wiring of the multi-arch publish jobs (cac, cac-fpm, shared-httpd):
|
||||||
|
# by-digest pushes, non-fatal arm64 leg, timeouts, exact tag scheme.
|
||||||
|
- name: multi-arch workflow wiring test
|
||||||
|
run: python3 -I scripts/tests/multiarch-workflow.test.py
|
||||||
|
|
||||||
|
- name: lsphp-src session defaults patch test
|
||||||
|
run: ./scripts/tests/lsphp-src-upload-progress.test.sh
|
||||||
|
|
||||||
- name: lsphp probe regression test
|
- name: lsphp probe regression test
|
||||||
run: ./scripts/tests/lsphp-info-probe.test.sh
|
run: ./scripts/tests/lsphp-info-probe.test.sh
|
||||||
@@ -73,18 +118,66 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
./scripts/tests/lsphp-abi-gate.test.sh
|
./scripts/tests/lsphp-abi-gate.test.sh
|
||||||
|
|
||||||
Build-and-Push:
|
# Decides which image legs run. A job-level `if:` cannot see the `matrix`
|
||||||
|
# context, so instead of skipping matrix cells this job emits one filtered
|
||||||
|
# matrix per image family (and a true/false per single-leg image); each image
|
||||||
|
# job below takes its matrix from here and is skipped when its list is empty.
|
||||||
|
# Push events and an empty `only` input plan the full set, as before.
|
||||||
|
plan:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 5
|
||||||
|
outputs:
|
||||||
|
cac: ${{ steps.plan.outputs.cac }}
|
||||||
|
cac_fpm: ${{ steps.plan.outputs.cac_fpm }}
|
||||||
|
cac_litespeed: ${{ steps.plan.outputs.cac_litespeed }}
|
||||||
|
cac_lsphp: ${{ steps.plan.outputs.cac_lsphp }}
|
||||||
|
shared_httpd: ${{ steps.plan.outputs.shared_httpd }}
|
||||||
|
shared_ols: ${{ steps.plan.outputs.shared_ols }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Plan legs
|
||||||
|
id: plan
|
||||||
|
env:
|
||||||
|
ONLY: ${{ github.event.inputs.only }}
|
||||||
|
run: .gitea/scripts/plan-legs.sh
|
||||||
|
|
||||||
|
Build-and-Push:
|
||||||
|
needs: plan
|
||||||
|
if: needs.plan.outputs.cac != '[]'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 75
|
||||||
strategy:
|
strategy:
|
||||||
# One PHP version failing (e.g. an EOL stream) must not cancel the
|
# One PHP version failing (e.g. an EOL stream) must not cancel the
|
||||||
# security builds of the others.
|
# security builds of the others.
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
phpver: [74, 80, 81, 82, 83, 84, 85]
|
phpver: ${{ fromJSON(needs.plan.outputs.cac) }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via
|
||||||
|
# the pkg-cache mirror), so the mirror can only serve content-addressed
|
||||||
|
# blobs that BuildKit verifies. If the lookup fails this job does NOT use
|
||||||
|
# the mirror and pulls the tag straight from Docker Hub. docs/pkg-cache.md.
|
||||||
|
- name: Resolve base image digest (Docker Hub, direct)
|
||||||
|
id: base
|
||||||
|
env:
|
||||||
|
BASE_TAG: almalinux/10-base:latest
|
||||||
|
run: |
|
||||||
|
set -uo pipefail
|
||||||
|
if ref=$(.gitea/scripts/resolve-base-image.sh "$BASE_TAG") && [[ "$ref" =~ ^[a-z0-9][a-z0-9._/-]*@sha256:[0-9a-f]{64}$ ]]; then
|
||||||
|
echo "base-image: ${BASE_TAG} -> ${ref} (digest from registry-1.docker.io)"
|
||||||
|
echo "image=${ref}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=true" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "::warning::base image ${BASE_TAG}: Docker Hub digest lookup failed - pulling the tag directly from Docker Hub, pkg-cache registry mirror NOT used"
|
||||||
|
echo "image=${BASE_TAG}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
||||||
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
||||||
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
||||||
@@ -92,17 +185,22 @@ jobs:
|
|||||||
# separately so either can fail back on its own.
|
# separately so either can fail back on its own.
|
||||||
- name: Probe package cache
|
- name: Probe package cache
|
||||||
id: pkgcache
|
id: pkgcache
|
||||||
|
# The registry mirror is only used for a digest-pinned base image.
|
||||||
|
env:
|
||||||
|
BASE_PINNED: ${{ steps.base.outputs.pinned }}
|
||||||
run: |
|
run: |
|
||||||
url=""; mirror=""
|
url=""; mirror=""
|
||||||
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
||||||
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
if [ "$BASE_PINNED" = true ] && curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
||||||
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<unreachable: Docker Hub>}"
|
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<not used: Docker Hub direct>}"
|
||||||
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
||||||
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
||||||
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
|
with:
|
||||||
|
platforms: arm64
|
||||||
|
|
||||||
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
|
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
|
||||||
# so the mirror is configured on the builder; BuildKit itself still falls
|
# so the mirror is configured on the builder; BuildKit itself still falls
|
||||||
@@ -157,32 +255,96 @@ jobs:
|
|||||||
username: ${{ secrets.CI_USER }}
|
username: ${{ secrets.CI_USER }}
|
||||||
password: ${{ secrets.CI_TOKEN }}
|
password: ${{ secrets.CI_TOKEN }}
|
||||||
|
|
||||||
- name: Build and Push Image
|
# amd64: required. Pushed untagged BY DIGEST (no tag); failure fails the
|
||||||
|
# job and publishes nothing, exactly as before multi-arch. The tags are only
|
||||||
|
# created by the assemble step below.
|
||||||
|
- name: Build amd64 (push by digest)
|
||||||
|
id: amd64
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64
|
||||||
push: true
|
|
||||||
build-args: |
|
build-args: |
|
||||||
PHPVER=${{ matrix.phpver }}
|
PHPVER=${{ matrix.phpver }}
|
||||||
CACHE_BUST=${{ steps.bust.outputs.value }}
|
CACHE_BUST=${{ steps.bust.outputs.value }}
|
||||||
|
BASE_IMAGE=${{ steps.base.outputs.image }}
|
||||||
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
||||||
EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}
|
EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}
|
||||||
tags: |
|
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/cac,push-by-digest=true,name-canonical=true,push=true
|
||||||
repo.anhonesthost.net/cloud-hosting-platform/cac:php${{ matrix.phpver }}
|
|
||||||
${{ matrix.phpver == '85' && 'repo.anhonesthost.net/cloud-hosting-platform/cac:latest' || '' }}
|
# arm64: best effort, built under QEMU on this same trusted x86 runner (no
|
||||||
|
# secret ever leaves it). Same Dockerfile, same build-args (incl. the php.net
|
||||||
|
# EXPECT_PHP_MIN gate, which runs `php -r` on the arm64 binary). Must never
|
||||||
|
# block or alter the amd64 tag: on failure/timeout the tag is published
|
||||||
|
# amd64-only, as before multi-arch.
|
||||||
|
- name: Build arm64 (push by digest)
|
||||||
|
id: arm64
|
||||||
|
continue-on-error: true
|
||||||
|
timeout-minutes: 45
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
platforms: linux/arm64
|
||||||
|
build-args: |
|
||||||
|
PHPVER=${{ matrix.phpver }}
|
||||||
|
CACHE_BUST=${{ steps.bust.outputs.value }}
|
||||||
|
BASE_IMAGE=${{ steps.base.outputs.image }}
|
||||||
|
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
||||||
|
EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}
|
||||||
|
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/cac,push-by-digest=true,name-canonical=true,push=true
|
||||||
|
|
||||||
|
# Creates the index tag(s) from THIS run's digests only (a previous run's
|
||||||
|
# arm64 is never re-attached). scripts/assemble-multiarch-index.sh.
|
||||||
|
- name: Assemble index tag(s)
|
||||||
|
env:
|
||||||
|
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
|
||||||
|
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }}
|
||||||
|
ARM64_OUTCOME: ${{ steps.arm64.outcome }}
|
||||||
|
PHPVER: ${{ matrix.phpver }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tags=(--tag "php${PHPVER}")
|
||||||
|
# :latest tracks php85 (unchanged tag scheme).
|
||||||
|
[ "$PHPVER" = 85 ] && tags+=(--tag latest)
|
||||||
|
scripts/assemble-multiarch-index.sh \
|
||||||
|
--amd64 "$AMD64_DIGEST" \
|
||||||
|
--arm64 "$ARM64_DIGEST" --arm64-outcome "$ARM64_OUTCOME" \
|
||||||
|
--repo repo.anhonesthost.net/cloud-hosting-platform/cac \
|
||||||
|
"${tags[@]}"
|
||||||
|
|
||||||
Build-FPM-Images:
|
Build-FPM-Images:
|
||||||
|
needs: plan
|
||||||
|
if: needs.plan.outputs.cac_fpm != '[]'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 75
|
||||||
strategy:
|
strategy:
|
||||||
# One PHP version failing (e.g. an EOL stream) must not cancel the
|
# One PHP version failing (e.g. an EOL stream) must not cancel the
|
||||||
# security builds of the others.
|
# security builds of the others.
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
phpver: [74, 80, 81, 82, 83, 84, 85]
|
phpver: ${{ fromJSON(needs.plan.outputs.cac_fpm) }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via
|
||||||
|
# the pkg-cache mirror), so the mirror can only serve content-addressed
|
||||||
|
# blobs that BuildKit verifies. If the lookup fails this job does NOT use
|
||||||
|
# the mirror and pulls the tag straight from Docker Hub. docs/pkg-cache.md.
|
||||||
|
- name: Resolve base image digest (Docker Hub, direct)
|
||||||
|
id: base
|
||||||
|
env:
|
||||||
|
BASE_TAG: almalinux/10-base:latest
|
||||||
|
run: |
|
||||||
|
set -uo pipefail
|
||||||
|
if ref=$(.gitea/scripts/resolve-base-image.sh "$BASE_TAG") && [[ "$ref" =~ ^[a-z0-9][a-z0-9._/-]*@sha256:[0-9a-f]{64}$ ]]; then
|
||||||
|
echo "base-image: ${BASE_TAG} -> ${ref} (digest from registry-1.docker.io)"
|
||||||
|
echo "image=${ref}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=true" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "::warning::base image ${BASE_TAG}: Docker Hub digest lookup failed - pulling the tag directly from Docker Hub, pkg-cache registry mirror NOT used"
|
||||||
|
echo "image=${BASE_TAG}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
||||||
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
||||||
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
||||||
@@ -190,17 +352,22 @@ jobs:
|
|||||||
# separately so either can fail back on its own.
|
# separately so either can fail back on its own.
|
||||||
- name: Probe package cache
|
- name: Probe package cache
|
||||||
id: pkgcache
|
id: pkgcache
|
||||||
|
# The registry mirror is only used for a digest-pinned base image.
|
||||||
|
env:
|
||||||
|
BASE_PINNED: ${{ steps.base.outputs.pinned }}
|
||||||
run: |
|
run: |
|
||||||
url=""; mirror=""
|
url=""; mirror=""
|
||||||
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
||||||
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
if [ "$BASE_PINNED" = true ] && curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
||||||
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<unreachable: Docker Hub>}"
|
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<not used: Docker Hub direct>}"
|
||||||
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
||||||
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
||||||
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
|
with:
|
||||||
|
platforms: arm64
|
||||||
|
|
||||||
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
|
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
|
||||||
# so the mirror is configured on the builder; BuildKit itself still falls
|
# so the mirror is configured on the builder; BuildKit itself still falls
|
||||||
@@ -255,23 +422,71 @@ jobs:
|
|||||||
username: ${{ secrets.CI_USER }}
|
username: ${{ secrets.CI_USER }}
|
||||||
password: ${{ secrets.CI_TOKEN }}
|
password: ${{ secrets.CI_TOKEN }}
|
||||||
|
|
||||||
- name: Build and Push FPM Image
|
# amd64: required. Pushed untagged BY DIGEST (no tag); failure fails the
|
||||||
|
# job and publishes nothing, exactly as before multi-arch. The tags are only
|
||||||
|
# created by the assemble step below.
|
||||||
|
- name: Build amd64 (push by digest)
|
||||||
|
id: amd64
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
file: ./Dockerfile.fpm
|
file: ./Dockerfile.fpm
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64
|
||||||
push: true
|
|
||||||
build-args: |
|
build-args: |
|
||||||
PHPVER=${{ matrix.phpver }}
|
PHPVER=${{ matrix.phpver }}
|
||||||
CACHE_BUST=${{ steps.bust.outputs.value }}
|
CACHE_BUST=${{ steps.bust.outputs.value }}
|
||||||
|
BASE_IMAGE=${{ steps.base.outputs.image }}
|
||||||
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
||||||
EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}
|
EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}
|
||||||
tags: |
|
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/cac-fpm,push-by-digest=true,name-canonical=true,push=true
|
||||||
repo.anhonesthost.net/cloud-hosting-platform/cac-fpm:php${{ matrix.phpver }}
|
|
||||||
${{ matrix.phpver == '85' && 'repo.anhonesthost.net/cloud-hosting-platform/cac-fpm:latest' || '' }}
|
# arm64: best effort, built under QEMU on this same trusted x86 runner (no
|
||||||
|
# secret ever leaves it). Same Dockerfile, same build-args (incl. the php.net
|
||||||
|
# EXPECT_PHP_MIN gate, which runs `php -r` on the arm64 binary). Must never
|
||||||
|
# block or alter the amd64 tag: on failure/timeout the tag is published
|
||||||
|
# amd64-only, as before multi-arch.
|
||||||
|
- name: Build arm64 (push by digest)
|
||||||
|
id: arm64
|
||||||
|
continue-on-error: true
|
||||||
|
timeout-minutes: 45
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
file: ./Dockerfile.fpm
|
||||||
|
platforms: linux/arm64
|
||||||
|
build-args: |
|
||||||
|
PHPVER=${{ matrix.phpver }}
|
||||||
|
CACHE_BUST=${{ steps.bust.outputs.value }}
|
||||||
|
BASE_IMAGE=${{ steps.base.outputs.image }}
|
||||||
|
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
||||||
|
EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}
|
||||||
|
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/cac-fpm,push-by-digest=true,name-canonical=true,push=true
|
||||||
|
|
||||||
|
# Creates the index tag(s) from THIS run's digests only (a previous run's
|
||||||
|
# arm64 is never re-attached). scripts/assemble-multiarch-index.sh.
|
||||||
|
- name: Assemble index tag(s)
|
||||||
|
env:
|
||||||
|
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
|
||||||
|
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }}
|
||||||
|
ARM64_OUTCOME: ${{ steps.arm64.outcome }}
|
||||||
|
PHPVER: ${{ matrix.phpver }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tags=(--tag "php${PHPVER}")
|
||||||
|
# :latest tracks php85 (unchanged tag scheme).
|
||||||
|
[ "$PHPVER" = 85 ] && tags+=(--tag latest)
|
||||||
|
scripts/assemble-multiarch-index.sh \
|
||||||
|
--amd64 "$AMD64_DIGEST" \
|
||||||
|
--arm64 "$ARM64_DIGEST" --arm64-outcome "$ARM64_OUTCOME" \
|
||||||
|
--repo repo.anhonesthost.net/cloud-hosting-platform/cac-fpm \
|
||||||
|
"${tags[@]}"
|
||||||
|
|
||||||
Build-LiteSpeed-Images:
|
Build-LiteSpeed-Images:
|
||||||
|
needs: plan
|
||||||
|
if: needs.plan.outputs.cac_litespeed != '[]'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
# One place for the OLS base tag: digest lookup and build-args both read it.
|
||||||
|
# OLS_VERSION pinned to 1.8.4 (see the build step); Dockerfile default differs.
|
||||||
|
env:
|
||||||
|
OLS_VERSION: "1.8.4"
|
||||||
strategy:
|
strategy:
|
||||||
# One PHP version failing (e.g. an EOL stream) must not cancel the
|
# One PHP version failing (e.g. an EOL stream) must not cancel the
|
||||||
# security builds of the others.
|
# security builds of the others.
|
||||||
@@ -281,15 +496,68 @@ jobs:
|
|||||||
# images stop at older OLS releases for those PHP versions, and the
|
# images stop at older OLS releases for those PHP versions, and the
|
||||||
# cac-litespeed tier is a paid premium offering: 8.1+ is the
|
# cac-litespeed tier is a paid premium offering: 8.1+ is the
|
||||||
# modernization story we're selling.
|
# modernization story we're selling.
|
||||||
phpver: [81, 82, 83, 84, 85]
|
phpver: ${{ fromJSON(needs.plan.outputs.cac_litespeed) }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via
|
||||||
|
# the pkg-cache mirror), so the mirror can only serve content-addressed
|
||||||
|
# blobs that BuildKit verifies. If the lookup fails this job does NOT use
|
||||||
|
# the mirror and pulls the tag straight from Docker Hub. docs/pkg-cache.md.
|
||||||
|
- name: Resolve base image digest (Docker Hub, direct)
|
||||||
|
id: base
|
||||||
|
env:
|
||||||
|
BASE_TAG: litespeedtech/openlitespeed:${{ env.OLS_VERSION }}-lsphp${{ matrix.phpver }}
|
||||||
|
run: |
|
||||||
|
set -uo pipefail
|
||||||
|
if ref=$(.gitea/scripts/resolve-base-image.sh "$BASE_TAG") && [[ "$ref" =~ ^[a-z0-9][a-z0-9._/-]*@sha256:[0-9a-f]{64}$ ]]; then
|
||||||
|
echo "base-image: ${BASE_TAG} -> ${ref} (digest from registry-1.docker.io)"
|
||||||
|
echo "image=${ref}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=true" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "::warning::base image ${BASE_TAG}: Docker Hub digest lookup failed - pulling the tag directly from Docker Hub, pkg-cache registry mirror NOT used"
|
||||||
|
echo "image=${BASE_TAG}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
||||||
|
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
||||||
|
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
||||||
|
# exactly as before. The repo cache and the registry mirror are probed
|
||||||
|
# separately so either can fail back on its own.
|
||||||
|
- name: Probe package cache
|
||||||
|
id: pkgcache
|
||||||
|
# The registry mirror is only used for a digest-pinned base image.
|
||||||
|
env:
|
||||||
|
BASE_PINNED: ${{ steps.base.outputs.pinned }}
|
||||||
|
run: |
|
||||||
|
url=""; mirror=""
|
||||||
|
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
||||||
|
if [ "$BASE_PINNED" = true ] && curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
||||||
|
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<not used: Docker Hub direct>}"
|
||||||
|
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
||||||
|
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
|
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
|
||||||
|
# so the mirror is configured on the builder; BuildKit itself still falls
|
||||||
|
# back to Docker Hub if the mirror stops answering mid-run.
|
||||||
|
- name: Set up Docker Buildx (Docker Hub via pkg-cache mirror)
|
||||||
|
if: steps.pkgcache.outputs.mirror != ''
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
with:
|
||||||
|
buildkitd-config-inline: |
|
||||||
|
[registry."docker.io"]
|
||||||
|
mirrors = ["192.168.1.40:5000"]
|
||||||
|
[registry."192.168.1.40:5000"]
|
||||||
|
ca = ["${{ github.workspace }}/keys/pkg-cache/ca.crt"]
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
|
if: steps.pkgcache.outputs.mirror == ''
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
# Per-run cache-bust value. Each job's buildx builder is created fresh by
|
# Per-run cache-bust value. Each job's buildx builder is created fresh by
|
||||||
@@ -314,8 +582,7 @@ jobs:
|
|||||||
PHPVER: ${{ matrix.phpver }}
|
PHPVER: ${{ matrix.phpver }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
idx=$(curl -fsS --proto '=https' --retry 3 --max-time 60 https://rpms.litespeedtech.com/debian/dists/noble/main/binary-amd64/Packages)
|
pkg=$(./scripts/lsphp-repo-version.sh "${PHPVER}" "${LSPHP_ARCH:-amd64}")
|
||||||
pkg=$(printf '%s\n' "$idx" | awk -v p="lsphp${PHPVER}" '/^Package: /{n=$2} /^Version: / && n==p {print $2}' | sort -V | tail -n1)
|
|
||||||
if [ -z "$pkg" ]; then echo "::error::lsphp${PHPVER} not found in the LiteSpeed repo index"; exit 1; fi
|
if [ -z "$pkg" ]; then echo "::error::lsphp${PHPVER} not found in the LiteSpeed repo index"; exit 1; fi
|
||||||
php="${pkg%%-*}"
|
php="${pkg%%-*}"
|
||||||
[[ "$pkg" =~ ^[0-9][0-9A-Za-z.+~:-]*$ ]] || { echo "::error::malformed lsphp${PHPVER} package version in the repo index"; exit 1; }
|
[[ "$pkg" =~ ^[0-9][0-9A-Za-z.+~:-]*$ ]] || { echo "::error::malformed lsphp${PHPVER} package version in the repo index"; exit 1; }
|
||||||
@@ -335,7 +602,10 @@ jobs:
|
|||||||
# :phpNN points at right now. While LiteSpeed still lags, a normal build
|
# :phpNN points at right now. While LiteSpeed still lags, a normal build
|
||||||
# would silently put the VULNERABLE packaged lsphp back. Refuse instead;
|
# would silently put the VULNERABLE packaged lsphp back. Refuse instead;
|
||||||
# the job goes green again by itself once the LiteSpeed repo catches up.
|
# the job goes green again by itself once the LiteSpeed repo catches up.
|
||||||
# Fail-open if the tag cannot be inspected (first build, registry blip).
|
# Reads the labels of the linux/amd64 image behind the tag (index-safe:
|
||||||
|
# works for single-platform and multi-arch tags) and FAILS CLOSED if they
|
||||||
|
# cannot be read; only a tag that does not exist yet (first build) passes
|
||||||
|
# unchecked. scripts/php-emergency-guard.sh, tests in scripts/tests/.
|
||||||
- name: Do not roll back a newer php.net emergency image
|
- name: Do not roll back a newer php.net emergency image
|
||||||
env:
|
env:
|
||||||
PHPVER: ${{ matrix.phpver }}
|
PHPVER: ${{ matrix.phpver }}
|
||||||
@@ -343,14 +613,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
ref="repo.anhonesthost.net/cloud-hosting-platform/cac-litespeed:php${PHPVER}"
|
ref="repo.anhonesthost.net/cloud-hosting-platform/cac-litespeed:php${PHPVER}"
|
||||||
src=$(docker buildx imagetools inspect "$ref" --format '{{ index .Image.Config.Labels "org.whp.lsphp-source" }}' 2>/dev/null || true)
|
./scripts/php-emergency-guard.sh "$ref" "$NEW_PHP"
|
||||||
cur=$(docker buildx imagetools inspect "$ref" --format '{{ index .Image.Config.Labels "org.whp.php-version" }}' 2>/dev/null || true)
|
|
||||||
new="$NEW_PHP"
|
|
||||||
echo "published $ref: source=${src:-?} php=${cur:-?}; this build: packaged $new"
|
|
||||||
if [ "$src" = "php.net" ] && [ "$cur" != "$new" ] && [ "$(printf '%s\n%s\n' "$cur" "$new" | sort -V | tail -n1)" = "$cur" ]; then
|
|
||||||
echo "::error::$ref is a php.net emergency build of PHP $cur; LiteSpeed still ships $new. Not overwriting it with an older PHP. Re-run lsphp-source-emergency.yaml for a newer fix, or wait for LiteSpeed."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Build and Push LiteSpeed Image
|
- name: Build and Push LiteSpeed Image
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
@@ -360,21 +623,28 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
build-args: |
|
build-args: |
|
||||||
PHPVER=${{ matrix.phpver }}
|
PHPVER=${{ matrix.phpver }}
|
||||||
OLS_VERSION=1.8.4
|
OLS_VERSION=${{ env.OLS_VERSION }}
|
||||||
|
BASE_IMAGE=${{ steps.base.outputs.image }}
|
||||||
|
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
||||||
CACHE_BUST=${{ steps.bust.outputs.value }}
|
CACHE_BUST=${{ steps.bust.outputs.value }}
|
||||||
EXPECT_LSPHP_PKG=${{ steps.lsphp.outputs.pkg }}
|
EXPECT_LSPHP_PKG=${{ steps.lsphp.outputs.pkg }}
|
||||||
EXPECT_PHP_VERSION=${{ steps.lsphp.outputs.php }}
|
EXPECT_PHP_VERSION=${{ steps.lsphp.outputs.php }}
|
||||||
# OLS_VERSION pinned to 1.8.4 — only release with prebuilt images
|
# OLS_VERSION pinned to 1.8.4. It was the only release with an lsphp81
|
||||||
# for every PHP version we ship (1.8.5 and 1.9.0 don't have an
|
# variant; 8.1 and older are no longer built (2026-10-21), so the pin
|
||||||
# lsphp81 variant on Docker Hub). Bump alongside a local rebuild
|
# can move to a newer OLS release after a local rebuild test.
|
||||||
# test when LiteSpeed publishes lsphp81 on a newer OLS release.
|
|
||||||
# See spec: docs/superpowers/specs/2026-06-01-cac-litespeed-design.md
|
# See spec: docs/superpowers/specs/2026-06-01-cac-litespeed-design.md
|
||||||
tags: |
|
tags: |
|
||||||
repo.anhonesthost.net/cloud-hosting-platform/cac-litespeed:php${{ matrix.phpver }}
|
repo.anhonesthost.net/cloud-hosting-platform/cac-litespeed:php${{ matrix.phpver }}
|
||||||
${{ matrix.phpver == '85' && 'repo.anhonesthost.net/cloud-hosting-platform/cac-litespeed:latest' || '' }}
|
${{ matrix.phpver == '85' && 'repo.anhonesthost.net/cloud-hosting-platform/cac-litespeed:latest' || '' }}
|
||||||
|
|
||||||
Build-LSPHP-Images:
|
Build-LSPHP-Images:
|
||||||
|
needs: plan
|
||||||
|
if: needs.plan.outputs.cac_lsphp != '[]'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
# One place for the OLS base tag: digest lookup and build-args both read it.
|
||||||
|
# OLS_VERSION pinned to 1.8.4 (see the build step); Dockerfile default differs.
|
||||||
|
env:
|
||||||
|
OLS_VERSION: "1.8.4"
|
||||||
strategy:
|
strategy:
|
||||||
# One PHP version failing (e.g. an EOL stream) must not cancel the
|
# One PHP version failing (e.g. an EOL stream) must not cancel the
|
||||||
# security builds of the others.
|
# security builds of the others.
|
||||||
@@ -384,15 +654,68 @@ jobs:
|
|||||||
# backend for the shared-ols tier and shares the litespeed prebuilt
|
# backend for the shared-ols tier and shares the litespeed prebuilt
|
||||||
# base, which only ships lsphp for 8.1+. Keep this matrix in lockstep
|
# base, which only ships lsphp for 8.1+. Keep this matrix in lockstep
|
||||||
# with Build-LiteSpeed-Images.
|
# with Build-LiteSpeed-Images.
|
||||||
phpver: [81, 82, 83, 84, 85]
|
phpver: ${{ fromJSON(needs.plan.outputs.cac_lsphp) }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via
|
||||||
|
# the pkg-cache mirror), so the mirror can only serve content-addressed
|
||||||
|
# blobs that BuildKit verifies. If the lookup fails this job does NOT use
|
||||||
|
# the mirror and pulls the tag straight from Docker Hub. docs/pkg-cache.md.
|
||||||
|
- name: Resolve base image digest (Docker Hub, direct)
|
||||||
|
id: base
|
||||||
|
env:
|
||||||
|
BASE_TAG: litespeedtech/openlitespeed:${{ env.OLS_VERSION }}-lsphp${{ matrix.phpver }}
|
||||||
|
run: |
|
||||||
|
set -uo pipefail
|
||||||
|
if ref=$(.gitea/scripts/resolve-base-image.sh "$BASE_TAG") && [[ "$ref" =~ ^[a-z0-9][a-z0-9._/-]*@sha256:[0-9a-f]{64}$ ]]; then
|
||||||
|
echo "base-image: ${BASE_TAG} -> ${ref} (digest from registry-1.docker.io)"
|
||||||
|
echo "image=${ref}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=true" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "::warning::base image ${BASE_TAG}: Docker Hub digest lookup failed - pulling the tag directly from Docker Hub, pkg-cache registry mirror NOT used"
|
||||||
|
echo "image=${BASE_TAG}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
||||||
|
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
||||||
|
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
||||||
|
# exactly as before. The repo cache and the registry mirror are probed
|
||||||
|
# separately so either can fail back on its own.
|
||||||
|
- name: Probe package cache
|
||||||
|
id: pkgcache
|
||||||
|
# The registry mirror is only used for a digest-pinned base image.
|
||||||
|
env:
|
||||||
|
BASE_PINNED: ${{ steps.base.outputs.pinned }}
|
||||||
|
run: |
|
||||||
|
url=""; mirror=""
|
||||||
|
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
||||||
|
if [ "$BASE_PINNED" = true ] && curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
||||||
|
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<not used: Docker Hub direct>}"
|
||||||
|
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
||||||
|
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
|
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
|
||||||
|
# so the mirror is configured on the builder; BuildKit itself still falls
|
||||||
|
# back to Docker Hub if the mirror stops answering mid-run.
|
||||||
|
- name: Set up Docker Buildx (Docker Hub via pkg-cache mirror)
|
||||||
|
if: steps.pkgcache.outputs.mirror != ''
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
with:
|
||||||
|
buildkitd-config-inline: |
|
||||||
|
[registry."docker.io"]
|
||||||
|
mirrors = ["192.168.1.40:5000"]
|
||||||
|
[registry."192.168.1.40:5000"]
|
||||||
|
ca = ["${{ github.workspace }}/keys/pkg-cache/ca.crt"]
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
|
if: steps.pkgcache.outputs.mirror == ''
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
# Per-run cache-bust value. Each job's buildx builder is created fresh by
|
# Per-run cache-bust value. Each job's buildx builder is created fresh by
|
||||||
@@ -417,8 +740,7 @@ jobs:
|
|||||||
PHPVER: ${{ matrix.phpver }}
|
PHPVER: ${{ matrix.phpver }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
idx=$(curl -fsS --proto '=https' --retry 3 --max-time 60 https://rpms.litespeedtech.com/debian/dists/noble/main/binary-amd64/Packages)
|
pkg=$(./scripts/lsphp-repo-version.sh "${PHPVER}" "${LSPHP_ARCH:-amd64}")
|
||||||
pkg=$(printf '%s\n' "$idx" | awk -v p="lsphp${PHPVER}" '/^Package: /{n=$2} /^Version: / && n==p {print $2}' | sort -V | tail -n1)
|
|
||||||
if [ -z "$pkg" ]; then echo "::error::lsphp${PHPVER} not found in the LiteSpeed repo index"; exit 1; fi
|
if [ -z "$pkg" ]; then echo "::error::lsphp${PHPVER} not found in the LiteSpeed repo index"; exit 1; fi
|
||||||
php="${pkg%%-*}"
|
php="${pkg%%-*}"
|
||||||
[[ "$pkg" =~ ^[0-9][0-9A-Za-z.+~:-]*$ ]] || { echo "::error::malformed lsphp${PHPVER} package version in the repo index"; exit 1; }
|
[[ "$pkg" =~ ^[0-9][0-9A-Za-z.+~:-]*$ ]] || { echo "::error::malformed lsphp${PHPVER} package version in the repo index"; exit 1; }
|
||||||
@@ -438,7 +760,10 @@ jobs:
|
|||||||
# :phpNN points at right now. While LiteSpeed still lags, a normal build
|
# :phpNN points at right now. While LiteSpeed still lags, a normal build
|
||||||
# would silently put the VULNERABLE packaged lsphp back. Refuse instead;
|
# would silently put the VULNERABLE packaged lsphp back. Refuse instead;
|
||||||
# the job goes green again by itself once the LiteSpeed repo catches up.
|
# the job goes green again by itself once the LiteSpeed repo catches up.
|
||||||
# Fail-open if the tag cannot be inspected (first build, registry blip).
|
# Reads the labels of the linux/amd64 image behind the tag (index-safe:
|
||||||
|
# works for single-platform and multi-arch tags) and FAILS CLOSED if they
|
||||||
|
# cannot be read; only a tag that does not exist yet (first build) passes
|
||||||
|
# unchecked. scripts/php-emergency-guard.sh, tests in scripts/tests/.
|
||||||
- name: Do not roll back a newer php.net emergency image
|
- name: Do not roll back a newer php.net emergency image
|
||||||
env:
|
env:
|
||||||
PHPVER: ${{ matrix.phpver }}
|
PHPVER: ${{ matrix.phpver }}
|
||||||
@@ -446,14 +771,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
ref="repo.anhonesthost.net/cloud-hosting-platform/cac-lsphp:php${PHPVER}"
|
ref="repo.anhonesthost.net/cloud-hosting-platform/cac-lsphp:php${PHPVER}"
|
||||||
src=$(docker buildx imagetools inspect "$ref" --format '{{ index .Image.Config.Labels "org.whp.lsphp-source" }}' 2>/dev/null || true)
|
./scripts/php-emergency-guard.sh "$ref" "$NEW_PHP"
|
||||||
cur=$(docker buildx imagetools inspect "$ref" --format '{{ index .Image.Config.Labels "org.whp.php-version" }}' 2>/dev/null || true)
|
|
||||||
new="$NEW_PHP"
|
|
||||||
echo "published $ref: source=${src:-?} php=${cur:-?}; this build: packaged $new"
|
|
||||||
if [ "$src" = "php.net" ] && [ "$cur" != "$new" ] && [ "$(printf '%s\n%s\n' "$cur" "$new" | sort -V | tail -n1)" = "$cur" ]; then
|
|
||||||
echo "::error::$ref is a php.net emergency build of PHP $cur; LiteSpeed still ships $new. Not overwriting it with an older PHP. Re-run lsphp-source-emergency.yaml for a newer fix, or wait for LiteSpeed."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Build and Push lsphp Image
|
- name: Build and Push lsphp Image
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
@@ -463,7 +781,9 @@ jobs:
|
|||||||
push: true
|
push: true
|
||||||
build-args: |
|
build-args: |
|
||||||
PHPVER=${{ matrix.phpver }}
|
PHPVER=${{ matrix.phpver }}
|
||||||
OLS_VERSION=1.8.4
|
OLS_VERSION=${{ env.OLS_VERSION }}
|
||||||
|
BASE_IMAGE=${{ steps.base.outputs.image }}
|
||||||
|
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
||||||
CACHE_BUST=${{ steps.bust.outputs.value }}
|
CACHE_BUST=${{ steps.bust.outputs.value }}
|
||||||
EXPECT_LSPHP_PKG=${{ steps.lsphp.outputs.pkg }}
|
EXPECT_LSPHP_PKG=${{ steps.lsphp.outputs.pkg }}
|
||||||
EXPECT_PHP_VERSION=${{ steps.lsphp.outputs.php }}
|
EXPECT_PHP_VERSION=${{ steps.lsphp.outputs.php }}
|
||||||
@@ -474,11 +794,34 @@ jobs:
|
|||||||
${{ matrix.phpver == '85' && 'repo.anhonesthost.net/cloud-hosting-platform/cac-lsphp:latest' || '' }}
|
${{ matrix.phpver == '85' && 'repo.anhonesthost.net/cloud-hosting-platform/cac-lsphp:latest' || '' }}
|
||||||
|
|
||||||
Build-Shared-httpd:
|
Build-Shared-httpd:
|
||||||
|
needs: plan
|
||||||
|
if: needs.plan.outputs.shared_httpd == 'true'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 50
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via
|
||||||
|
# the pkg-cache mirror), so the mirror can only serve content-addressed
|
||||||
|
# blobs that BuildKit verifies. If the lookup fails this job does NOT use
|
||||||
|
# the mirror and pulls the tag straight from Docker Hub. docs/pkg-cache.md.
|
||||||
|
- name: Resolve base image digest (Docker Hub, direct)
|
||||||
|
id: base
|
||||||
|
env:
|
||||||
|
BASE_TAG: almalinux/10-base:latest
|
||||||
|
run: |
|
||||||
|
set -uo pipefail
|
||||||
|
if ref=$(.gitea/scripts/resolve-base-image.sh "$BASE_TAG") && [[ "$ref" =~ ^[a-z0-9][a-z0-9._/-]*@sha256:[0-9a-f]{64}$ ]]; then
|
||||||
|
echo "base-image: ${BASE_TAG} -> ${ref} (digest from registry-1.docker.io)"
|
||||||
|
echo "image=${ref}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=true" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "::warning::base image ${BASE_TAG}: Docker Hub digest lookup failed - pulling the tag directly from Docker Hub, pkg-cache registry mirror NOT used"
|
||||||
|
echo "image=${BASE_TAG}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
||||||
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
||||||
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
||||||
@@ -486,17 +829,22 @@ jobs:
|
|||||||
# separately so either can fail back on its own.
|
# separately so either can fail back on its own.
|
||||||
- name: Probe package cache
|
- name: Probe package cache
|
||||||
id: pkgcache
|
id: pkgcache
|
||||||
|
# The registry mirror is only used for a digest-pinned base image.
|
||||||
|
env:
|
||||||
|
BASE_PINNED: ${{ steps.base.outputs.pinned }}
|
||||||
run: |
|
run: |
|
||||||
url=""; mirror=""
|
url=""; mirror=""
|
||||||
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
||||||
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
if [ "$BASE_PINNED" = true ] && curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
||||||
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<unreachable: Docker Hub>}"
|
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<not used: Docker Hub direct>}"
|
||||||
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
||||||
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
||||||
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
|
with:
|
||||||
|
platforms: arm64
|
||||||
|
|
||||||
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
|
# BuildKit (docker-container driver) ignores dockerd's registry-mirrors,
|
||||||
# so the mirror is configured on the builder; BuildKit itself still falls
|
# so the mirror is configured on the builder; BuildKit itself still falls
|
||||||
@@ -522,23 +870,85 @@ jobs:
|
|||||||
username: ${{ secrets.CI_USER }}
|
username: ${{ secrets.CI_USER }}
|
||||||
password: ${{ secrets.CI_TOKEN }}
|
password: ${{ secrets.CI_TOKEN }}
|
||||||
|
|
||||||
- name: Build and Push Shared httpd Image
|
# amd64: required. Pushed untagged BY DIGEST (no tag); failure fails the
|
||||||
|
# job and publishes nothing, exactly as before multi-arch. The tags are only
|
||||||
|
# created by the assemble step below.
|
||||||
|
- name: Build amd64 (push by digest)
|
||||||
|
id: amd64
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
file: ./Dockerfile.shared-httpd
|
file: ./Dockerfile.shared-httpd
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64
|
||||||
push: true
|
|
||||||
build-args: |
|
build-args: |
|
||||||
|
BASE_IMAGE=${{ steps.base.outputs.image }}
|
||||||
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
||||||
tags: |
|
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/shared-httpd,push-by-digest=true,name-canonical=true,push=true
|
||||||
repo.anhonesthost.net/cloud-hosting-platform/shared-httpd:latest
|
|
||||||
|
# arm64: best effort, built under QEMU on this same trusted x86 runner (no
|
||||||
|
# secret ever leaves it). Same Dockerfile, same build-args (incl. the php.net
|
||||||
|
# EXPECT_PHP_MIN gate, which runs `php -r` on the arm64 binary). Must never
|
||||||
|
# block or alter the amd64 tag: on failure/timeout the tag is published
|
||||||
|
# amd64-only, as before multi-arch.
|
||||||
|
- name: Build arm64 (push by digest)
|
||||||
|
id: arm64
|
||||||
|
continue-on-error: true
|
||||||
|
timeout-minutes: 25
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
file: ./Dockerfile.shared-httpd
|
||||||
|
platforms: linux/arm64
|
||||||
|
build-args: |
|
||||||
|
BASE_IMAGE=${{ steps.base.outputs.image }}
|
||||||
|
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
||||||
|
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/shared-httpd,push-by-digest=true,name-canonical=true,push=true
|
||||||
|
|
||||||
|
# Creates the index tag(s) from THIS run's digests only (a previous run's
|
||||||
|
# arm64 is never re-attached). scripts/assemble-multiarch-index.sh.
|
||||||
|
- name: Assemble index tag(s)
|
||||||
|
env:
|
||||||
|
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
|
||||||
|
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }}
|
||||||
|
ARM64_OUTCOME: ${{ steps.arm64.outcome }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
scripts/assemble-multiarch-index.sh \
|
||||||
|
--amd64 "$AMD64_DIGEST" \
|
||||||
|
--arm64 "$ARM64_DIGEST" --arm64-outcome "$ARM64_OUTCOME" \
|
||||||
|
--repo repo.anhonesthost.net/cloud-hosting-platform/shared-httpd \
|
||||||
|
--tag latest
|
||||||
|
|
||||||
Build-Shared-OLS:
|
Build-Shared-OLS:
|
||||||
|
needs: plan
|
||||||
|
if: needs.plan.outputs.shared_ols == 'true'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
# One place for the OLS base tag: digest lookup and build-args both read it.
|
||||||
|
env:
|
||||||
|
OLS_VERSION: "1.8.4"
|
||||||
|
PHPVER: "83"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# Base image pinned by DIGEST, looked up directly at Docker Hub (never via
|
||||||
|
# the pkg-cache mirror), so the mirror can only serve content-addressed
|
||||||
|
# blobs that BuildKit verifies. If the lookup fails this job does NOT use
|
||||||
|
# the mirror and pulls the tag straight from Docker Hub. docs/pkg-cache.md.
|
||||||
|
- name: Resolve base image digest (Docker Hub, direct)
|
||||||
|
id: base
|
||||||
|
env:
|
||||||
|
BASE_TAG: litespeedtech/openlitespeed:${{ env.OLS_VERSION }}-lsphp${{ env.PHPVER }}
|
||||||
|
run: |
|
||||||
|
set -uo pipefail
|
||||||
|
if ref=$(.gitea/scripts/resolve-base-image.sh "$BASE_TAG") && [[ "$ref" =~ ^[a-z0-9][a-z0-9._/-]*@sha256:[0-9a-f]{64}$ ]]; then
|
||||||
|
echo "base-image: ${BASE_TAG} -> ${ref} (digest from registry-1.docker.io)"
|
||||||
|
echo "image=${ref}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=true" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "::warning::base image ${BASE_TAG}: Docker Hub digest lookup failed - pulling the tag directly from Docker Hub, pkg-cache registry mirror NOT used"
|
||||||
|
echo "image=${BASE_TAG}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "pinned=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
# Internal package cache (CT130 pkg-cache, docs/pkg-cache.md). Used ONLY if
|
||||||
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
# it answers over TLS with our pinned CA; otherwise (down, unreachable,
|
||||||
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
# bad/expired cert) this job builds from the upstream repos and Docker Hub
|
||||||
@@ -546,11 +956,14 @@ jobs:
|
|||||||
# separately so either can fail back on its own.
|
# separately so either can fail back on its own.
|
||||||
- name: Probe package cache
|
- name: Probe package cache
|
||||||
id: pkgcache
|
id: pkgcache
|
||||||
|
# The registry mirror is only used for a digest-pinned base image.
|
||||||
|
env:
|
||||||
|
BASE_PINNED: ${{ steps.base.outputs.pinned }}
|
||||||
run: |
|
run: |
|
||||||
url=""; mirror=""
|
url=""; mirror=""
|
||||||
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40/; then url="https://192.168.1.40"; fi
|
||||||
if curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
if [ "$BASE_PINNED" = true ] && curl -fsS --max-time 5 --cacert keys/pkg-cache/ca.crt -o /dev/null https://192.168.1.40:5000/v2/; then mirror="192.168.1.40:5000"; fi
|
||||||
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<unreachable: Docker Hub>}"
|
echo "pkg-cache: repos=${url:-<unreachable: upstream>} registry-mirror=${mirror:-<not used: Docker Hub direct>}"
|
||||||
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
[ -n "$url" ] || echo "::warning::pkg-cache unreachable - building from upstream repositories"
|
||||||
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
echo "url=${url}" >> "$GITHUB_OUTPUT"
|
||||||
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
echo "mirror=${mirror}" >> "$GITHUB_OUTPUT"
|
||||||
@@ -591,8 +1004,9 @@ jobs:
|
|||||||
# Single image (runs no PHP). PHPVER just selects the OLS base tag;
|
# Single image (runs no PHP). PHPVER just selects the OLS base tag;
|
||||||
# pinned to 83 / OLS 1.8.4 to match the rest of the litespeed family.
|
# pinned to 83 / OLS 1.8.4 to match the rest of the litespeed family.
|
||||||
build-args: |
|
build-args: |
|
||||||
PHPVER=83
|
PHPVER=${{ env.PHPVER }}
|
||||||
OLS_VERSION=1.8.4
|
OLS_VERSION=${{ env.OLS_VERSION }}
|
||||||
|
BASE_IMAGE=${{ steps.base.outputs.image }}
|
||||||
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
PKG_CACHE=${{ steps.pkgcache.outputs.url }}
|
||||||
tags: |
|
tags: |
|
||||||
repo.anhonesthost.net/cloud-hosting-platform/shared-ols:latest
|
repo.anhonesthost.net/cloud-hosting-platform/shared-ols:latest
|
||||||
@@ -15,6 +15,16 @@ run-name: EMERGENCY lsphp php.net build by ${{ gitea.actor }}
|
|||||||
##
|
##
|
||||||
## Tags: always :phpNN-phpnet-X.Y.Z (immutable, for staging / rollback)
|
## Tags: always :phpNN-phpnet-X.Y.Z (immutable, for staging / rollback)
|
||||||
## and :phpNN only when push_production_tags = true.
|
## and :phpNN only when push_production_tags = true.
|
||||||
|
##
|
||||||
|
## Multi-arch safety (docs/arm64/IMAGE-PIPELINE-PLAN.md 2.2 #6, 4.4): each
|
||||||
|
## platform is pushed BY DIGEST and the tags are assembled afterwards with
|
||||||
|
## scripts/assemble-multiarch-index.sh (copy of haproxy-manager-base's), so a
|
||||||
|
## tag is never overwritten with a bare single-platform manifest by accident.
|
||||||
|
## arm64 is built from the SAME php.net source in THIS run (continue-on-error);
|
||||||
|
## a previous run's arm64 is never re-attached. If a production tag is
|
||||||
|
## currently a multi-arch index and arm64 was not built successfully, the
|
||||||
|
## production tag is REFUSED unless allow_amd64_only = true (an explicit
|
||||||
|
## security-over-parity decision); the immutable tag is still created.
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
@@ -32,6 +42,16 @@ on:
|
|||||||
required: true
|
required: true
|
||||||
default: false
|
default: false
|
||||||
type: boolean
|
type: boolean
|
||||||
|
build_arm64:
|
||||||
|
description: "Also build linux/arm64 (QEMU, slow, best effort). Needed to keep arm64 in a multi-arch :phpNN."
|
||||||
|
required: false
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
allow_amd64_only:
|
||||||
|
description: "Allow replacing a multi-arch production tag with amd64-only when arm64 is not built/failed (ARM hosts then cannot pull it)."
|
||||||
|
required: false
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Build-lsphp-from-source:
|
Build-lsphp-from-source:
|
||||||
@@ -39,7 +59,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
phpver: [81, 82, 83, 84, 85]
|
phpver: [82, 83, 84, 85]
|
||||||
image: [lsphp, litespeed]
|
image: [lsphp, litespeed]
|
||||||
steps:
|
steps:
|
||||||
- name: Select this job's target (skip if not requested)
|
- name: Select this job's target (skip if not requested)
|
||||||
@@ -49,6 +69,8 @@ jobs:
|
|||||||
IN_VERSIONS: ${{ inputs.php_versions }}
|
IN_VERSIONS: ${{ inputs.php_versions }}
|
||||||
IN_IMAGES: ${{ inputs.images }}
|
IN_IMAGES: ${{ inputs.images }}
|
||||||
IN_PROD: ${{ format('{0}', inputs.push_production_tags) }}
|
IN_PROD: ${{ format('{0}', inputs.push_production_tags) }}
|
||||||
|
IN_ARM: ${{ format('{0}', inputs.build_arm64) }}
|
||||||
|
IN_AMD_ONLY: ${{ format('{0}', inputs.allow_amd64_only) }}
|
||||||
PHPVER: ${{ matrix.phpver }}
|
PHPVER: ${{ matrix.phpver }}
|
||||||
IMG: ${{ matrix.image }}
|
IMG: ${{ matrix.image }}
|
||||||
run: |
|
run: |
|
||||||
@@ -57,10 +79,14 @@ jobs:
|
|||||||
case "$IN_PROD" in true|false) ;; *) echo "::error::push_production_tags must be true|false, got '$IN_PROD'"; exit 1 ;; esac
|
case "$IN_PROD" in true|false) ;; *) echo "::error::push_production_tags must be true|false, got '$IN_PROD'"; exit 1 ;; esac
|
||||||
v=""
|
v=""
|
||||||
for pair in $IN_VERSIONS; do
|
for pair in $IN_VERSIONS; do
|
||||||
[[ "$pair" =~ ^(8[1-5])=([0-9]+\.[0-9]+\.[0-9]+)$ ]] || { echo "::error::bad php_versions entry '$pair' (want NN=X.Y.Z, NN in 81..85)"; exit 1; }
|
[[ "$pair" =~ ^(8[2-5])=([0-9]+\.[0-9]+\.[0-9]+)$ ]] || { echo "::error::bad php_versions entry '$pair' (want NN=X.Y.Z, NN in 82..85)"; exit 1; }
|
||||||
[ "${BASH_REMATCH[1]}" = "$PHPVER" ] && v="${BASH_REMATCH[2]}"
|
[ "${BASH_REMATCH[1]}" = "$PHPVER" ] && v="${BASH_REMATCH[2]}"
|
||||||
done
|
done
|
||||||
|
case "$IN_ARM" in true|false) ;; *) echo "::error::build_arm64 must be true|false, got '$IN_ARM'"; exit 1 ;; esac
|
||||||
|
case "$IN_AMD_ONLY" in true|false) ;; *) echo "::error::allow_amd64_only must be true|false, got '$IN_AMD_ONLY'"; exit 1 ;; esac
|
||||||
echo "prod=$IN_PROD" >> "$GITHUB_OUTPUT"
|
echo "prod=$IN_PROD" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "arm=$IN_ARM" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "amd_only=$IN_AMD_ONLY" >> "$GITHUB_OUTPUT"
|
||||||
if [ -z "$v" ] || { [ "$IN_IMAGES" != both ] && [ "$IN_IMAGES" != "$IMG" ]; }; then
|
if [ -z "$v" ] || { [ "$IN_IMAGES" != both ] && [ "$IN_IMAGES" != "$IMG" ]; }; then
|
||||||
echo "not requested: php${PHPVER} / ${IMG}"; echo "skip=1" >> "$GITHUB_OUTPUT"; exit 0
|
echo "not requested: php${PHPVER} / ${IMG}"; echo "skip=1" >> "$GITHUB_OUTPUT"; exit 0
|
||||||
fi
|
fi
|
||||||
@@ -92,8 +118,7 @@ jobs:
|
|||||||
sha=$(printf '%s' "$json" | python3 -c 'import json,sys; d=json.load(sys.stdin); v=sys.argv[1]; print(next((s["sha256"] for s in d.get("source", []) if s.get("filename")=="php-%s.tar.xz"%v), ""))' "$v")
|
sha=$(printf '%s' "$json" | python3 -c 'import json,sys; d=json.load(sys.stdin); v=sys.argv[1]; print(next((s["sha256"] for s in d.get("source", []) if s.get("filename")=="php-%s.tar.xz"%v), ""))' "$v")
|
||||||
[ -n "$sha" ] || { echo "::error::php.net has no release php-$v.tar.xz (EOL branch? typo?): $json"; exit 1; }
|
[ -n "$sha" ] || { echo "::error::php.net has no release php-$v.tar.xz (EOL branch? typo?): $json"; exit 1; }
|
||||||
[[ "$sha" =~ ^[0-9a-f]{64}$ ]] || { echo "::error::no sha256 for php-$v.tar.xz in the php.net releases JSON"; exit 1; }
|
[[ "$sha" =~ ^[0-9a-f]{64}$ ]] || { echo "::error::no sha256 for php-$v.tar.xz in the php.net releases JSON"; exit 1; }
|
||||||
idx=$(curl -fsS --proto '=https' --retry 3 --max-time 60 https://rpms.litespeedtech.com/debian/dists/noble/main/binary-amd64/Packages)
|
pkg=$(./scripts/lsphp-repo-version.sh "${PHPVER}" "${LSPHP_ARCH:-amd64}")
|
||||||
pkg=$(printf '%s\n' "$idx" | awk -v p="lsphp${PHPVER}" '/^Package: /{n=$2} /^Version: / && n==p {print $2}' | sort -V | tail -n1)
|
|
||||||
[ -n "$pkg" ] || { echo "::error::lsphp${PHPVER} not in the LiteSpeed repo index"; exit 1; }
|
[ -n "$pkg" ] || { echo "::error::lsphp${PHPVER} not in the LiteSpeed repo index"; exit 1; }
|
||||||
[[ "$pkg" =~ ^[0-9][0-9A-Za-z.+~:-]*$ ]] || { echo "::error::malformed lsphp${PHPVER} package version in the repo index"; exit 1; }
|
[[ "$pkg" =~ ^[0-9][0-9A-Za-z.+~:-]*$ ]] || { echo "::error::malformed lsphp${PHPVER} package version in the repo index"; exit 1; }
|
||||||
pphp=${pkg%%-*}
|
pphp=${pkg%%-*}
|
||||||
@@ -112,6 +137,12 @@ jobs:
|
|||||||
if: steps.t.outputs.skip == '0'
|
if: steps.t.outputs.skip == '0'
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Set up QEMU (arm64)
|
||||||
|
if: steps.t.outputs.skip == '0' && steps.t.outputs.arm == 'true'
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
with:
|
||||||
|
platforms: arm64
|
||||||
|
|
||||||
- name: Login to Gitea
|
- name: Login to Gitea
|
||||||
if: steps.t.outputs.skip == '0'
|
if: steps.t.outputs.skip == '0'
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
@@ -120,13 +151,15 @@ jobs:
|
|||||||
username: ${{ secrets.CI_USER }}
|
username: ${{ secrets.CI_USER }}
|
||||||
password: ${{ secrets.CI_TOKEN }}
|
password: ${{ secrets.CI_TOKEN }}
|
||||||
|
|
||||||
- name: Build and push (php.net lsphp)
|
# amd64: required. Pushed untagged by digest; tags are made below.
|
||||||
|
- name: Build amd64 (push by digest)
|
||||||
if: steps.t.outputs.skip == '0'
|
if: steps.t.outputs.skip == '0'
|
||||||
|
id: amd64
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
file: ${{ steps.t.outputs.dockerfile }}
|
file: ${{ steps.t.outputs.dockerfile }}
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64
|
||||||
push: true
|
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/${{ steps.t.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true
|
||||||
build-args: |
|
build-args: |
|
||||||
PHPVER=${{ matrix.phpver }}
|
PHPVER=${{ matrix.phpver }}
|
||||||
OLS_VERSION=1.8.4
|
OLS_VERSION=1.8.4
|
||||||
@@ -136,7 +169,74 @@ jobs:
|
|||||||
PHP_SRC_VERSION=${{ steps.t.outputs.version }}
|
PHP_SRC_VERSION=${{ steps.t.outputs.version }}
|
||||||
PHP_SRC_SHA256=${{ steps.v.outputs.sha }}
|
PHP_SRC_SHA256=${{ steps.v.outputs.sha }}
|
||||||
LSPHP_SOURCE=php.net
|
LSPHP_SOURCE=php.net
|
||||||
tags: |
|
|
||||||
repo.anhonesthost.net/cloud-hosting-platform/${{ steps.t.outputs.image_name }}:php${{ matrix.phpver }}-phpnet-${{ steps.t.outputs.version }}
|
# arm64: best effort, same php.net source and version, never blocks amd64.
|
||||||
${{ steps.t.outputs.prod == 'true' && format('repo.anhonesthost.net/cloud-hosting-platform/{0}:php{1}', steps.t.outputs.image_name, matrix.phpver) || '' }}
|
- name: Build arm64 (push by digest)
|
||||||
${{ steps.t.outputs.prod == 'true' && matrix.phpver == 85 && format('repo.anhonesthost.net/cloud-hosting-platform/{0}:latest', steps.t.outputs.image_name) || '' }}
|
if: steps.t.outputs.skip == '0' && steps.t.outputs.arm == 'true'
|
||||||
|
id: arm64
|
||||||
|
continue-on-error: true
|
||||||
|
timeout-minutes: 120
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
file: ${{ steps.t.outputs.dockerfile }}
|
||||||
|
platforms: linux/arm64
|
||||||
|
outputs: type=image,name=repo.anhonesthost.net/cloud-hosting-platform/${{ steps.t.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true
|
||||||
|
build-args: |
|
||||||
|
PHPVER=${{ matrix.phpver }}
|
||||||
|
OLS_VERSION=1.8.4
|
||||||
|
CACHE_BUST=${{ steps.v.outputs.bust }}
|
||||||
|
EXPECT_LSPHP_PKG=${{ steps.v.outputs.pkg }}
|
||||||
|
EXPECT_PHP_VERSION=${{ steps.v.outputs.pkgphp }}
|
||||||
|
PHP_SRC_VERSION=${{ steps.t.outputs.version }}
|
||||||
|
PHP_SRC_SHA256=${{ steps.v.outputs.sha }}
|
||||||
|
LSPHP_SOURCE=php.net
|
||||||
|
|
||||||
|
# Immutable staging/rollback tag: always created (amd64, + arm64 if built).
|
||||||
|
- name: Assemble immutable tag
|
||||||
|
if: steps.t.outputs.skip == '0'
|
||||||
|
env:
|
||||||
|
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
|
||||||
|
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }}
|
||||||
|
ARM64_OUTCOME: ${{ steps.arm64.outcome }}
|
||||||
|
REPO: repo.anhonesthost.net/cloud-hosting-platform/${{ steps.t.outputs.image_name }}
|
||||||
|
TAG: php${{ matrix.phpver }}-phpnet-${{ steps.t.outputs.version }}
|
||||||
|
run: |
|
||||||
|
./scripts/assemble-multiarch-index.sh \
|
||||||
|
--amd64 "$AMD64_DIGEST" \
|
||||||
|
--arm64 "$ARM64_DIGEST" --arm64-outcome "${ARM64_OUTCOME:-skipped}" \
|
||||||
|
--repo "$REPO" --tag "$TAG"
|
||||||
|
|
||||||
|
# Production tags: never silently drop arm64 from a multi-arch tag.
|
||||||
|
- name: Assemble production tags
|
||||||
|
if: steps.t.outputs.skip == '0' && steps.t.outputs.prod == 'true'
|
||||||
|
env:
|
||||||
|
AMD64_DIGEST: ${{ steps.amd64.outputs.digest }}
|
||||||
|
ARM64_DIGEST: ${{ steps.arm64.outputs.digest }}
|
||||||
|
ARM64_OUTCOME: ${{ steps.arm64.outcome }}
|
||||||
|
ALLOW_AMD_ONLY: ${{ steps.t.outputs.amd_only }}
|
||||||
|
REPO: repo.anhonesthost.net/cloud-hosting-platform/${{ steps.t.outputs.image_name }}
|
||||||
|
PHPVER: ${{ matrix.phpver }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
tags=(--tag "php${PHPVER}")
|
||||||
|
[ "$PHPVER" = 85 ] && tags+=(--tag latest)
|
||||||
|
if [ "${ARM64_OUTCOME:-skipped}" != success ] && [ "$ALLOW_AMD_ONLY" != true ]; then
|
||||||
|
for t in "php${PHPVER}" $([ "$PHPVER" = 85 ] && echo latest); do
|
||||||
|
rc=0; info=$(./scripts/index-platforms.sh "$REPO:$t") || rc=$?
|
||||||
|
case "$rc" in
|
||||||
|
0) ;;
|
||||||
|
3) info="not found" ;;
|
||||||
|
*) echo "::error::cannot tell whether $REPO:$t is multi-arch; refusing to overwrite it (fail closed)"; exit 1 ;;
|
||||||
|
esac
|
||||||
|
echo "$REPO:$t currently: $info"
|
||||||
|
case "$info" in
|
||||||
|
*linux/arm64*)
|
||||||
|
echo "::error::$REPO:$t is multi-arch (has arm64) but arm64 was not built successfully in this run (outcome=${ARM64_OUTCOME:-skipped}). Publishing amd64-only would drop arm64. Re-run with build_arm64=true, or set allow_amd64_only=true to accept that. The immutable tag was still created."
|
||||||
|
exit 1 ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
./scripts/assemble-multiarch-index.sh \
|
||||||
|
--amd64 "$AMD64_DIGEST" \
|
||||||
|
--arm64 "$ARM64_DIGEST" --arm64-outcome "${ARM64_OUTCOME:-skipped}" \
|
||||||
|
--repo "$REPO" "${tags[@]}"
|
||||||
+20
-2
@@ -1,4 +1,9 @@
|
|||||||
FROM almalinux/10-base
|
# Base image. CI passes BASE_IMAGE=almalinux/10-base@sha256:<digest>, resolved
|
||||||
|
# DIRECTLY from Docker Hub in the same run (.gitea/scripts/resolve-base-image.sh),
|
||||||
|
# so the pkg-cache registry mirror can only serve content-addressed blobs.
|
||||||
|
# Local builds use the tag. docs/pkg-cache.md "Base-image digest pinning".
|
||||||
|
ARG BASE_IMAGE=almalinux/10-base
|
||||||
|
FROM ${BASE_IMAGE}
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
# Per-CI-run value: the first RUN below (dnf update) and everything after it can
|
# Per-CI-run value: the first RUN below (dnf update) and everything after it can
|
||||||
# never be a layer-cache hit, so every build gets the repos' current packages.
|
# never be a layer-cache hit, so every build gets the repos' current packages.
|
||||||
@@ -75,6 +80,8 @@ COPY ./configs/prod-php.ini /etc/php.ini
|
|||||||
COPY ./configs/zz-php2shell-mitigation.ini /etc/php.d/zz-php2shell-mitigation.ini
|
COPY ./configs/zz-php2shell-mitigation.ini /etc/php.d/zz-php2shell-mitigation.ini
|
||||||
COPY ./configs/phpinfo.php /var/www/html/
|
COPY ./configs/phpinfo.php /var/www/html/
|
||||||
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
||||||
|
# mirror.mariadb.org names the arch dir amd64/aarch64 (not $basearch); amd64 result is byte-identical.
|
||||||
|
RUN sed -i "s/rhel\$releasever-amd64/rhel\$releasever-$(uname -m | sed s/x86_64/amd64/)/" /etc/yum.repos.d/mariadb.repo
|
||||||
COPY ./configs/index.php /var/www/html/
|
COPY ./configs/index.php /var/www/html/
|
||||||
COPY ./configs/remote_ip.conf /etc/httpd/conf.d/
|
COPY ./configs/remote_ip.conf /etc/httpd/conf.d/
|
||||||
COPY ./configs/whp-security.conf /etc/httpd/conf.d/
|
COPY ./configs/whp-security.conf /etc/httpd/conf.d/
|
||||||
@@ -82,7 +89,18 @@ COPY ./configs/whp-security.conf /etc/httpd/conf.d/
|
|||||||
# Set up cron job in a single layer
|
# Set up cron job in a single layer
|
||||||
RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab
|
RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab
|
||||||
|
|
||||||
|
# CVE-2026-119618 defense in depth: no HTTP/2 / mod_md in the image, build fails
|
||||||
|
# if they come back or the config no longer parses. scripts/httpd-h2-md-gate.sh.
|
||||||
|
# Placed after every other package step so nothing later can re-add them.
|
||||||
|
RUN /scripts/httpd-h2-md-gate.sh remove && /scripts/httpd-h2-md-gate.sh check
|
||||||
|
LABEL org.whp.httpd-h2-md="removed"
|
||||||
|
|
||||||
|
## Healthy = Apache answered with anything but a 5xx. `curl -f` also failed on
|
||||||
|
## 4xx, so a new site with an empty docroot (403) or an app with no route for /
|
||||||
|
## (404) showed unhealthy forever, and WHP's monitor restarted it as "PHP
|
||||||
|
## wedged". 000 (no answer) and 5xx (PHP/app error) still fail.
|
||||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
|
||||||
CMD curl -f http://localhost/ || exit 1
|
CMD code=$(curl -s -o /dev/null -m 4 -w '%{http_code}' http://localhost/); \
|
||||||
|
case "$code" in 000|5*) echo "http $code"; exit 1;; esac
|
||||||
|
|
||||||
ENTRYPOINT [ "/scripts/entrypoint.sh" ]
|
ENTRYPOINT [ "/scripts/entrypoint.sh" ]
|
||||||
+13
-1
@@ -1,4 +1,9 @@
|
|||||||
FROM almalinux/10-base
|
# Base image. CI passes BASE_IMAGE=almalinux/10-base@sha256:<digest>, resolved
|
||||||
|
# DIRECTLY from Docker Hub in the same run (.gitea/scripts/resolve-base-image.sh),
|
||||||
|
# so the pkg-cache registry mirror can only serve content-addressed blobs.
|
||||||
|
# Local builds use the tag. docs/pkg-cache.md "Base-image digest pinning".
|
||||||
|
ARG BASE_IMAGE=almalinux/10-base
|
||||||
|
FROM ${BASE_IMAGE}
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
# Per-CI-run value: the first RUN below (dnf update) and everything after it can
|
# Per-CI-run value: the first RUN below (dnf update) and everything after it can
|
||||||
# never be a layer-cache hit, so every build gets the repos' current packages.
|
# never be a layer-cache hit, so every build gets the repos' current packages.
|
||||||
@@ -72,10 +77,17 @@ COPY ./configs/prod-php.ini /etc/php.ini
|
|||||||
# all images ship PHP >= 8.2.35 / 8.3.36 / 8.4.27 / 8.5.12.
|
# all images ship PHP >= 8.2.35 / 8.3.36 / 8.4.27 / 8.5.12.
|
||||||
COPY ./configs/zz-php2shell-mitigation.ini /etc/php.d/zz-php2shell-mitigation.ini
|
COPY ./configs/zz-php2shell-mitigation.ini /etc/php.d/zz-php2shell-mitigation.ini
|
||||||
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
||||||
|
# mirror.mariadb.org names the arch dir amd64/aarch64 (not $basearch); amd64 result is byte-identical.
|
||||||
|
RUN sed -i "s/rhel\$releasever-amd64/rhel\$releasever-$(uname -m | sed s/x86_64/amd64/)/" /etc/yum.repos.d/mariadb.repo
|
||||||
|
|
||||||
# Set up cron job for log rotation
|
# Set up cron job for log rotation
|
||||||
RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab
|
RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab
|
||||||
|
|
||||||
|
# CVE-2026-119618: this image carries httpd-core only (no mod_http2/mod_md). The
|
||||||
|
# gate keeps it that way and records the version in /etc/whp-httpd-version.
|
||||||
|
RUN /scripts/httpd-h2-md-gate.sh remove && /scripts/httpd-h2-md-gate.sh check
|
||||||
|
LABEL org.whp.httpd-h2-md="removed"
|
||||||
|
|
||||||
EXPOSE 9000
|
EXPOSE 9000
|
||||||
|
|
||||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
|
||||||
|
|||||||
+18
-3
@@ -22,12 +22,18 @@
|
|||||||
## after FROM for any RUN steps that need it.
|
## after FROM for any RUN steps that need it.
|
||||||
ARG OLS_VERSION=1.8.5
|
ARG OLS_VERSION=1.8.5
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
|
## CI passes BASE_IMAGE=litespeedtech/openlitespeed@sha256:<digest> of the
|
||||||
|
## ${OLS_VERSION}-lsphp${PHPVER} tag, resolved DIRECTLY from Docker Hub in the same
|
||||||
|
## run (.gitea/scripts/resolve-base-image.sh), so the pkg-cache registry mirror can
|
||||||
|
## only serve content-addressed blobs. Local builds use the tag. Every stage below
|
||||||
|
## (incl. the emergency lsphp-src stage) starts from this one image.
|
||||||
|
ARG BASE_IMAGE=litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER}
|
||||||
|
|
||||||
## ---- EMERGENCY ONLY: lsphp compiled from php.net source ----------------------
|
## ---- EMERGENCY ONLY: lsphp compiled from php.net source ----------------------
|
||||||
## Idle unless PHP_SRC_VERSION is set (then /lsphp-src-out stays empty and the
|
## Idle unless PHP_SRC_VERSION is set (then /lsphp-src-out stays empty and the
|
||||||
## overlay step below is a no-op). Same stage as Dockerfile.lsphp — see there and
|
## overlay step below is a no-op). Same stage as Dockerfile.lsphp — see there and
|
||||||
## docs/lsphp-source-emergency.md.
|
## docs/lsphp-source-emergency.md.
|
||||||
FROM litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER} AS lsphp-src
|
FROM ${BASE_IMAGE} AS lsphp-src
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
ARG CACHE_BUST=
|
ARG CACHE_BUST=
|
||||||
ARG EXPECT_LSPHP_PKG=
|
ARG EXPECT_LSPHP_PKG=
|
||||||
@@ -42,7 +48,7 @@ RUN --mount=type=bind,source=scripts,target=/mnt/scripts \
|
|||||||
fi; \
|
fi; \
|
||||||
PHPVER="${PHPVER}" bash /mnt/scripts/lsphp-src-build.sh
|
PHPVER="${PHPVER}" bash /mnt/scripts/lsphp-src-build.sh
|
||||||
|
|
||||||
FROM litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER}
|
FROM ${BASE_IMAGE}
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
ENV PHPVER=${PHPVER}
|
ENV PHPVER=${PHPVER}
|
||||||
|
|
||||||
@@ -80,11 +86,20 @@ ENV PHPVER=${PHPVER}
|
|||||||
ARG CACHE_BUST=
|
ARG CACHE_BUST=
|
||||||
ARG EXPECT_LSPHP_PKG=
|
ARG EXPECT_LSPHP_PKG=
|
||||||
ARG EXPECT_PHP_VERSION=
|
ARG EXPECT_PHP_VERSION=
|
||||||
|
## OPTIONAL internal package cache, e.g. --build-arg PKG_CACHE=https://192.168.1.40
|
||||||
|
## (CT130 pkg-cache, https only). Unset = upstream repositories (Ubuntu +
|
||||||
|
## rpms.litespeedtech.com). Repo files are restored at the end of the RUN, so no
|
||||||
|
## layer keeps the cache address. See scripts/pkg-cache-repos.sh.
|
||||||
|
ARG PKG_CACHE=
|
||||||
|
COPY ./scripts/pkg-cache-repos.sh /usr/local/sbin/pkg-cache-repos.sh
|
||||||
|
COPY ./keys/pkg-cache/ /usr/local/share/pkg-cache/
|
||||||
COPY ./scripts/lsphp-apt-upgrade.sh /usr/local/sbin/lsphp-apt-upgrade.sh
|
COPY ./scripts/lsphp-apt-upgrade.sh /usr/local/sbin/lsphp-apt-upgrade.sh
|
||||||
RUN /usr/local/sbin/lsphp-apt-upgrade.sh "${PHPVER}" \
|
RUN /usr/local/sbin/pkg-cache-repos.sh apt && \
|
||||||
|
/usr/local/sbin/lsphp-apt-upgrade.sh "${PHPVER}" \
|
||||||
gettext-base sudo cron \
|
gettext-base sudo cron \
|
||||||
ca-certificates curl wget \
|
ca-certificates curl wget \
|
||||||
lsphp${PHPVER}-ldap && \
|
lsphp${PHPVER}-ldap && \
|
||||||
|
/usr/local/sbin/pkg-cache-repos.sh restore && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
|
rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
|
||||||
|
|
||||||
|
|||||||
+39
-5
@@ -21,6 +21,12 @@
|
|||||||
|
|
||||||
ARG OLS_VERSION=1.8.4
|
ARG OLS_VERSION=1.8.4
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
|
## CI passes BASE_IMAGE=litespeedtech/openlitespeed@sha256:<digest> of the
|
||||||
|
## ${OLS_VERSION}-lsphp${PHPVER} tag, resolved DIRECTLY from Docker Hub in the same
|
||||||
|
## run (.gitea/scripts/resolve-base-image.sh), so the pkg-cache registry mirror can
|
||||||
|
## only serve content-addressed blobs. Local builds use the tag. Every stage below
|
||||||
|
## (incl. the emergency lsphp-src stage) starts from this one image.
|
||||||
|
ARG BASE_IMAGE=litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER}
|
||||||
|
|
||||||
## ---- stage 0 (EMERGENCY ONLY): lsphp compiled from php.net source -----------
|
## ---- stage 0 (EMERGENCY ONLY): lsphp compiled from php.net source -----------
|
||||||
## Idle unless PHP_SRC_VERSION is set: lsphp-src-build.sh then exits at once and
|
## Idle unless PHP_SRC_VERSION is set: lsphp-src-build.sh then exits at once and
|
||||||
@@ -30,7 +36,7 @@ ARG PHPVER=83
|
|||||||
## — CI: .gitea/workflows/lsphp-source-emergency.yaml; runbook:
|
## — CI: .gitea/workflows/lsphp-source-emergency.yaml; runbook:
|
||||||
## docs/lsphp-source-emergency.md. The tarball is sha256- AND OpenPGP-verified
|
## docs/lsphp-source-emergency.md. The tarball is sha256- AND OpenPGP-verified
|
||||||
## against keys/php-src/; configure flags are replayed from the packaged lsphp.
|
## against keys/php-src/; configure flags are replayed from the packaged lsphp.
|
||||||
FROM litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER} AS lsphp-src
|
FROM ${BASE_IMAGE} AS lsphp-src
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
ARG CACHE_BUST=
|
ARG CACHE_BUST=
|
||||||
ARG EXPECT_LSPHP_PKG=
|
ARG EXPECT_LSPHP_PKG=
|
||||||
@@ -77,7 +83,7 @@ RUN --mount=type=bind,source=scripts,target=/mnt/scripts \
|
|||||||
## Separate stage on purpose: the compiler + headers (~400MB) stay out of the
|
## Separate stage on purpose: the compiler + headers (~400MB) stay out of the
|
||||||
## shipped image, which gains only the ~40KB .so. Costs ~1-2 min of CI per PHP
|
## shipped image, which gains only the ~40KB .so. Costs ~1-2 min of CI per PHP
|
||||||
## version; both stages share the same base layer, so no extra pull.
|
## version; both stages share the same base layer, so no extra pull.
|
||||||
FROM litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER} AS ext-build
|
FROM ${BASE_IMAGE} AS ext-build
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
|
|
||||||
## Toolchain layer, deliberately BEFORE the source COPY so editing the extension
|
## Toolchain layer, deliberately BEFORE the source COPY so editing the extension
|
||||||
@@ -94,11 +100,20 @@ ARG PHPVER=83
|
|||||||
ARG CACHE_BUST=
|
ARG CACHE_BUST=
|
||||||
ARG EXPECT_LSPHP_PKG=
|
ARG EXPECT_LSPHP_PKG=
|
||||||
ARG EXPECT_PHP_VERSION=
|
ARG EXPECT_PHP_VERSION=
|
||||||
|
## OPTIONAL internal package cache, e.g. --build-arg PKG_CACHE=https://192.168.1.40
|
||||||
|
## (CT130 pkg-cache, https only). Unset = upstream repositories (Ubuntu +
|
||||||
|
## rpms.litespeedtech.com). Repo files are restored at the end of the RUN, so no
|
||||||
|
## layer keeps the cache address. See scripts/pkg-cache-repos.sh.
|
||||||
|
ARG PKG_CACHE=
|
||||||
|
COPY ./scripts/pkg-cache-repos.sh /usr/local/sbin/pkg-cache-repos.sh
|
||||||
|
COPY ./keys/pkg-cache/ /usr/local/share/pkg-cache/
|
||||||
COPY ./scripts/lsphp-apt-upgrade.sh /usr/local/sbin/lsphp-apt-upgrade.sh
|
COPY ./scripts/lsphp-apt-upgrade.sh /usr/local/sbin/lsphp-apt-upgrade.sh
|
||||||
RUN set -e; \
|
RUN set -e; \
|
||||||
|
/usr/local/sbin/pkg-cache-repos.sh apt; \
|
||||||
/usr/local/sbin/lsphp-apt-upgrade.sh --no-os-upgrade "${PHPVER}" \
|
/usr/local/sbin/lsphp-apt-upgrade.sh --no-os-upgrade "${PHPVER}" \
|
||||||
build-essential autoconf pkg-config \
|
build-essential autoconf pkg-config \
|
||||||
lsphp${PHPVER}-dev; \
|
lsphp${PHPVER}-dev; \
|
||||||
|
/usr/local/sbin/pkg-cache-repos.sh restore; \
|
||||||
RTV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}); \
|
RTV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}); \
|
||||||
DEVV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}-dev); \
|
DEVV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}-dev); \
|
||||||
if [ "$RTV" != "$DEVV" ]; then \
|
if [ "$RTV" != "$DEVV" ]; then \
|
||||||
@@ -168,7 +183,7 @@ RUN set -e; \
|
|||||||
cp modules/cac_path_parity.so /build-out/
|
cp modules/cac_path_parity.so /build-out/
|
||||||
|
|
||||||
## ---- stage 2: the shipped sidecar image ------------------------------------
|
## ---- stage 2: the shipped sidecar image ------------------------------------
|
||||||
FROM litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER}
|
FROM ${BASE_IMAGE}
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
ENV PHPVER=${PHPVER}
|
ENV PHPVER=${PHPVER}
|
||||||
|
|
||||||
@@ -196,13 +211,30 @@ ENV PHPVER=${PHPVER}
|
|||||||
ARG CACHE_BUST=
|
ARG CACHE_BUST=
|
||||||
ARG EXPECT_LSPHP_PKG=
|
ARG EXPECT_LSPHP_PKG=
|
||||||
ARG EXPECT_PHP_VERSION=
|
ARG EXPECT_PHP_VERSION=
|
||||||
|
## OPTIONAL internal package cache, e.g. --build-arg PKG_CACHE=https://192.168.1.40
|
||||||
|
## (CT130 pkg-cache, https only). Unset = upstream repositories (Ubuntu +
|
||||||
|
## rpms.litespeedtech.com). Repo files are restored at the end of the RUN, so no
|
||||||
|
## layer keeps the cache address. See scripts/pkg-cache-repos.sh.
|
||||||
|
ARG PKG_CACHE=
|
||||||
|
COPY ./scripts/pkg-cache-repos.sh /usr/local/sbin/pkg-cache-repos.sh
|
||||||
|
COPY ./keys/pkg-cache/ /usr/local/share/pkg-cache/
|
||||||
COPY --from=ext-build /build-out/lsphp.version /etc/cac-lsphp-build.version
|
COPY --from=ext-build /build-out/lsphp.version /etc/cac-lsphp-build.version
|
||||||
COPY ./scripts/lsphp-apt-upgrade.sh /usr/local/sbin/lsphp-apt-upgrade.sh
|
COPY ./scripts/lsphp-apt-upgrade.sh /usr/local/sbin/lsphp-apt-upgrade.sh
|
||||||
|
COPY --chmod=0755 ./scripts/lsphp-pin-resolve.sh /usr/local/sbin/lsphp-pin-resolve.sh
|
||||||
|
## Per-package pins: lsphpNN is pinned to $V exactly; -common/-ldap to $V when the
|
||||||
|
## repo offers it, else to a same-PHP-version packaging revision >= $V (LiteSpeed
|
||||||
|
## published lsphp84 -2 with lsphp84-common -3 on 2026-11-19). See the script.
|
||||||
RUN set -e; \
|
RUN set -e; \
|
||||||
|
PR=/usr/local/sbin/lsphp-pin-resolve.sh; \
|
||||||
V=$(cat /etc/cac-lsphp-build.version); \
|
V=$(cat /etc/cac-lsphp-build.version); \
|
||||||
|
/usr/local/sbin/pkg-cache-repos.sh apt; \
|
||||||
|
apt-get update --error-on=any; \
|
||||||
|
VC=$($PR resolve lsphp${PHPVER}-common "$V"); \
|
||||||
|
VL=$($PR resolve lsphp${PHPVER}-ldap "$V"); \
|
||||||
|
echo "lsphp pins: lsphp${PHPVER}=$V -common=$VC -ldap=$VL"; \
|
||||||
if ! /usr/local/sbin/lsphp-apt-upgrade.sh "${PHPVER}" \
|
if ! /usr/local/sbin/lsphp-apt-upgrade.sh "${PHPVER}" \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
lsphp${PHPVER}="$V" lsphp${PHPVER}-common="$V" lsphp${PHPVER}-ldap="$V"; then \
|
lsphp${PHPVER}="$V" lsphp${PHPVER}-common="$VC" lsphp${PHPVER}-ldap="$VL"; then \
|
||||||
echo "FATAL: lsphp-apt-upgrade.sh failed (reason above). If apt said" >&2; \
|
echo "FATAL: lsphp-apt-upgrade.sh failed (reason above). If apt said" >&2; \
|
||||||
echo " \"Version '$V' ... was not found\" or refused a downgrade: $V is what" >&2; \
|
echo " \"Version '$V' ... was not found\" or refused a downgrade: $V is what" >&2; \
|
||||||
echo " cac_path_parity was compiled against, but the LiteSpeed repo (which" >&2; \
|
echo " cac_path_parity was compiled against, but the LiteSpeed repo (which" >&2; \
|
||||||
@@ -211,11 +243,13 @@ RUN set -e; \
|
|||||||
echo " build (CI) / rebuild with --no-cache (local)." >&2; \
|
echo " build (CI) / rebuild with --no-cache (local)." >&2; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
fi; \
|
fi; \
|
||||||
|
/usr/local/sbin/pkg-cache-repos.sh restore; \
|
||||||
apt-get clean; \
|
apt-get clean; \
|
||||||
rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*; \
|
rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*; \
|
||||||
RTV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}); \
|
RTV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}); \
|
||||||
CMV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}-common); \
|
CMV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}-common); \
|
||||||
if [ "$RTV" != "$V" ] || [ "$CMV" != "$V" ]; then \
|
LDV=$(dpkg-query -W -f='${Version}' lsphp${PHPVER}-ldap); \
|
||||||
|
if [ "$RTV" != "$V" ] || [ "$CMV" != "$VC" ] || [ "$LDV" != "$VL" ] || ! $PR ok "$CMV" "$V"; then \
|
||||||
echo "FATAL: cac_path_parity.so was compiled against lsphp${PHPVER} $V but this" >&2; \
|
echo "FATAL: cac_path_parity.so was compiled against lsphp${PHPVER} $V but this" >&2; \
|
||||||
echo " image would ship lsphp${PHPVER}=$RTV / -common=$CMV." >&2; \
|
echo " image would ship lsphp${PHPVER}=$RTV / -common=$CMV." >&2; \
|
||||||
echo " Rebuild with --no-cache so both stages resolve the same release." >&2; \
|
echo " Rebuild with --no-cache so both stages resolve the same release." >&2; \
|
||||||
|
|||||||
+13
-1
@@ -1,4 +1,9 @@
|
|||||||
FROM almalinux/10-base
|
# Base image. CI passes BASE_IMAGE=almalinux/10-base@sha256:<digest>, resolved
|
||||||
|
# DIRECTLY from Docker Hub in the same run (.gitea/scripts/resolve-base-image.sh),
|
||||||
|
# so the pkg-cache registry mirror can only serve content-addressed blobs.
|
||||||
|
# Local builds use the tag. docs/pkg-cache.md "Base-image digest pinning".
|
||||||
|
ARG BASE_IMAGE=almalinux/10-base
|
||||||
|
FROM ${BASE_IMAGE}
|
||||||
|
|
||||||
# OPTIONAL internal package cache, e.g. --build-arg PKG_CACHE=https://192.168.1.40
|
# OPTIONAL internal package cache, e.g. --build-arg PKG_CACHE=https://192.168.1.40
|
||||||
# (CT130 pkg-cache, https only). Unset = upstream repositories. Release RPMs are
|
# (CT130 pkg-cache, https only). Unset = upstream repositories. Release RPMs are
|
||||||
@@ -26,6 +31,7 @@ COPY ./scripts/log-rotate.sh /scripts/log-rotate.sh
|
|||||||
COPY ./scripts/entrypoint-shared-httpd.sh /scripts/entrypoint-shared-httpd.sh
|
COPY ./scripts/entrypoint-shared-httpd.sh /scripts/entrypoint-shared-httpd.sh
|
||||||
COPY ./scripts/stop-services.sh /scripts/stop-services.sh
|
COPY ./scripts/stop-services.sh /scripts/stop-services.sh
|
||||||
COPY ./scripts/tune-mpm.sh /scripts/tune-mpm.sh
|
COPY ./scripts/tune-mpm.sh /scripts/tune-mpm.sh
|
||||||
|
COPY ./scripts/httpd-h2-md-gate.sh /scripts/httpd-h2-md-gate.sh
|
||||||
RUN chmod +x /scripts/*
|
RUN chmod +x /scripts/*
|
||||||
|
|
||||||
# Generate self-signed SSL cert (same as main CAC image)
|
# Generate self-signed SSL cert (same as main CAC image)
|
||||||
@@ -44,6 +50,12 @@ RUN mkdir -p /etc/httpd/conf.d/vhosts
|
|||||||
# Set up cron job for log rotation
|
# Set up cron job for log rotation
|
||||||
RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab
|
RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab
|
||||||
|
|
||||||
|
# CVE-2026-119618 defense in depth: no HTTP/2 / mod_md in the image, build fails
|
||||||
|
# if they come back or the config no longer parses. scripts/httpd-h2-md-gate.sh.
|
||||||
|
# Placed after every other package step so nothing later can re-add them.
|
||||||
|
RUN /scripts/httpd-h2-md-gate.sh remove && /scripts/httpd-h2-md-gate.sh check
|
||||||
|
LABEL org.whp.httpd-h2-md="removed"
|
||||||
|
|
||||||
EXPOSE 80 443
|
EXPOSE 80 443
|
||||||
|
|
||||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
|
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
|
||||||
|
|||||||
@@ -17,7 +17,12 @@
|
|||||||
|
|
||||||
ARG OLS_VERSION=1.8.4
|
ARG OLS_VERSION=1.8.4
|
||||||
ARG PHPVER=83
|
ARG PHPVER=83
|
||||||
FROM litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER}
|
## CI passes BASE_IMAGE=litespeedtech/openlitespeed@sha256:<digest> of the
|
||||||
|
## ${OLS_VERSION}-lsphp${PHPVER} tag, resolved DIRECTLY from Docker Hub in the same
|
||||||
|
## run (.gitea/scripts/resolve-base-image.sh), so the pkg-cache registry mirror can
|
||||||
|
## only serve content-addressed blobs. Local builds use the tag.
|
||||||
|
ARG BASE_IMAGE=litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER}
|
||||||
|
FROM ${BASE_IMAGE}
|
||||||
|
|
||||||
## OPTIONAL internal package cache, e.g. --build-arg PKG_CACHE=https://192.168.1.40
|
## OPTIONAL internal package cache, e.g. --build-arg PKG_CACHE=https://192.168.1.40
|
||||||
## (CT130 pkg-cache, https only). Unset = upstream repositories. Release RPMs are
|
## (CT130 pkg-cache, https only). Unset = upstream repositories. Release RPMs are
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ Each of the following fails the build:
|
|||||||
| OpenPGP signature | `gpgv` rejects the `.asc` against `keys/php-src/php-keyring.asc`, or the signer's primary fingerprint is not listed for that branch in `keys/php-src/release-managers.txt`. |
|
| OpenPGP signature | `gpgv` rejects the `.asc` against `keys/php-src/php-keyring.asc`, or the signer's primary fingerprint is not listed for that branch in `keys/php-src/release-managers.txt`. |
|
||||||
| Version sanity | The version is not X.Y.Z, is not in the PHPVER branch, or is not newer than the packaged version. |
|
| Version sanity | The version is not X.Y.Z, is not in the PHPVER branch, or is not newer than the packaged version. |
|
||||||
| Configure | Replaying the packaged lsphp's own `Configure Command` fails. The usual cause is a `-dev` package missing from `DEVPKGS`. |
|
| Configure | Replaying the packaged lsphp's own `Configure Command` fails. The usual cause is a `-dev` package missing from `DEVPKGS`. |
|
||||||
| LSAPI SAPI | `php-litespeed-8.3.tgz` does not match its pinned sha256, or the built lsphp's set of `LSAPI_*` names differs from the packaged binary's. |
|
| LSAPI SAPI | `php-litespeed-8.4.tgz` (pinned 2026-11-19; was 8.3) does not match its pinned sha256, or the built lsphp's set of `LSAPI_*` names differs from the packaged binary's. |
|
||||||
| Compiled-in ini defaults | Any `php -n` ini default differs from the packaged binary. Directives that are new in the release are allowed and printed. |
|
| Compiled-in ini defaults | Any `php -n` ini default differs from the packaged binary. Directives that are new in the release are allowed and printed. |
|
||||||
| ABI gate | A struct member's offset or size changed, or a non-`*_globals` struct changed size. See `scripts/lsphp-abi-gate.sh`. |
|
| ABI gate | A struct member's offset or size changed, or a non-`*_globals` struct changed size. See `scripts/lsphp-abi-gate.sh`. |
|
||||||
| File replacement | A php-src ELF file owned by a package at the core version has no php.net counterpart. |
|
| File replacement | A php-src ELF file owned by a package at the core version has no php.net counterpart. |
|
||||||
|
|||||||
+71
-3
@@ -21,6 +21,10 @@ On that day a build without the cache spent **1031 s** in its first dnf step. Th
|
|||||||
| `https://192.168.1.40/ubuntu/` | `https://archive.ubuntu.com/ubuntu`, `https://us.archive.ubuntu.com/ubuntu` |
|
| `https://192.168.1.40/ubuntu/` | `https://archive.ubuntu.com/ubuntu`, `https://us.archive.ubuntu.com/ubuntu` |
|
||||||
| `https://192.168.1.40/ubuntu-security/` | `https://security.ubuntu.com/ubuntu`, `https://archive.ubuntu.com/ubuntu` |
|
| `https://192.168.1.40/ubuntu-security/` | `https://security.ubuntu.com/ubuntu`, `https://archive.ubuntu.com/ubuntu` |
|
||||||
| `https://192.168.1.40/litespeed/` | `https://rpms.litespeedtech.com`, then `http://rpms.litespeedtech.com` |
|
| `https://192.168.1.40/litespeed/` | `https://rpms.litespeedtech.com`, then `http://rpms.litespeedtech.com` |
|
||||||
|
| `https://192.168.1.40/nodesource/` | `https://rpm.nodesource.com` (origin only; RPMs signed, repomd not) — added 2026-10-22 |
|
||||||
|
| `https://192.168.1.40/debian/` | `https://deb.debian.org/debian` (CDN origin; princeton was 6 h behind on trixie-updates) — added 2026-10-22 |
|
||||||
|
| `https://192.168.1.40/debian-security/` | `https://security.debian.org/debian-security`, `https://deb.debian.org/debian-security` — added 2026-10-22 |
|
||||||
|
| `https://192.168.1.40/goproxy/` | `https://proxy.golang.org` (Go module proxy; `/sumdb/` is 404 there, so `go` checks sum.golang.org directly) — added 2026-10-22 |
|
||||||
| `192.168.1.40:5000` (TLS, pkg-cache CA) | Docker Hub pull-through cache (`registry-1.docker.io`) |
|
| `192.168.1.40:5000` (TLS, pkg-cache CA) | Docker Hub pull-through cache (`registry-1.docker.io`) |
|
||||||
|
|
||||||
Plain `http://192.168.1.40/` answers **403** to LAN clients.
|
Plain `http://192.168.1.40/` answers **403** to LAN clients.
|
||||||
@@ -32,6 +36,7 @@ Cache rules:
|
|||||||
- apt `dists/`, except `by-hash/`
|
- apt `dists/`, except `by-hash/`
|
||||||
- `*-latest*.rpm` and `remi-release-N.rpm`
|
- `*-latest*.rpm` and `remi-release-N.rpm`
|
||||||
- `RPM-GPG-KEY*`
|
- `RPM-GPG-KEY*`
|
||||||
|
- Go proxy `/@v/list` and `/@latest`
|
||||||
- directory listings
|
- directory listings
|
||||||
- **Packages** (`*.rpm`, `*.deb`, hash-named repodata, `by-hash/`) are cached for 30 days and evicted after 60 days unused. Total size is capped at 110 GB, with 15 GB kept free.
|
- **Packages** (`*.rpm`, `*.deb`, hash-named repodata, `by-hash/`) are cached for 30 days and evicted after 60 days unused. Total size is capped at 110 GB, with 15 GB kept free.
|
||||||
- On a connect error, timeout or 5xx, the request falls through to the next tier. Only the **last** tier may answer from a stale copy, so the order is primary, then fallback, then stale.
|
- On a connect error, timeout or 5xx, the request falls through to the next tier. Only the **last** tier may answer from a stale copy, so the order is primary, then fallback, then stale.
|
||||||
@@ -65,6 +70,18 @@ docker buildx build --build-arg PKG_CACHE=https://192.168.1.40 --build-arg PHPVE
|
|||||||
- Requires `rpm -K` to report `digests signatures OK`.
|
- Requires `rpm -K` to report `digests signatures OK`.
|
||||||
- Installs with `--setopt=localpkg_gpgcheck=1`.
|
- Installs with `--setopt=localpkg_gpgcheck=1`.
|
||||||
|
|
||||||
|
**`nodesource MAJOR`** (added 2026-10-22) replaces `curl https://rpm.nodesource.com/setup_N.x | bash`:
|
||||||
|
- writes `/etc/yum.repos.d/nodesource-nodejs.repo` with the ORIGIN baseurl, `gpgcheck=1` and `gpgkey=file:///usr/local/share/pkg-cache/RPM-GPG-KEY-nodesource` (key committed in `keys/pkg-cache/`);
|
||||||
|
- with `PKG_CACHE` it is then rewritten like the other repos; `restore` puts the origin version back, so the shipped image keeps a normal NodeSource repo.
|
||||||
|
|
||||||
|
**`go-env`** (added 2026-10-22): `eval "$(pkg-cache-repos.sh go-env)"` inside the RUN that runs `go mod download`/`go build`. Prints `GOPROXY=<cache>/goproxy|https://proxy.golang.org|direct` (`|` = fall through on ANY error) and `SSL_CERT_FILE=<state>/ca-bundle.pem`; nothing without `PKG_CACHE`. Modules stay verified by `go.sum` + sum.golang.org. End the RUN with `restore` (removes the bundle).
|
||||||
|
|
||||||
|
**EL9**: `release-install epel|remi` picks the EL major from `rpm -E %rhel` (9 or 10); `RPM-GPG-KEY-EPEL-9` is committed.
|
||||||
|
|
||||||
|
**Debian** (`apt` mode): `deb.debian.org/debian`, `deb.debian.org/debian-security` and `security.debian.org` (classic and deb822 `.sources`) are rewritten to `<cache>/debian/` and `<cache>/debian-security/`.
|
||||||
|
|
||||||
|
**Not proxied, on purpose:** PyPI and the npm registry. Our pip/npm installs are not hash-locked (`pip install -r` without `--require-hashes`, `npm install -g pm2@latest`), so the client would trust whatever the cache served — a compromised cache would mean code execution in shipped images. Proxy them only after the installs are hash-pinned. GitHub-release downloads are likewise left direct.
|
||||||
|
|
||||||
**`restore`**:
|
**`restore`**:
|
||||||
- Puts rewritten files back.
|
- Puts rewritten files back.
|
||||||
- Deletes files the script created.
|
- Deletes files the script created.
|
||||||
@@ -75,9 +92,31 @@ Every RUN that rewrites ends with `restore`, so no shipped layer carries the LAN
|
|||||||
|
|
||||||
`PKG_CACHE` must start with `https://`. `http://` is refused.
|
`PKG_CACHE` must start with `https://`. `http://` is refused.
|
||||||
|
|
||||||
`Dockerfile.litespeed` and `Dockerfile.lsphp` are **not wired yet**. Two things are needed first:
|
`Dockerfile.litespeed` and `Dockerfile.lsphp` are wired since 2026-10-22 (normal apt path; the php.net EMERGENCY stage `lsphp-src` stays on upstream). `lsphp-apt-upgrade.sh`'s madison gate accepts `<PKG_CACHE>/litespeed/` only when `PKG_CACHE` is set.
|
||||||
- the multi-stage `lsphp-apt-upgrade.sh` flow needs a `PKG_CACHE` ARG in each stage;
|
|
||||||
- its madison check must accept the cache URL. It currently requires `*rpms.litespeedtech.com*`, and via the cache madison shows `https://192.168.1.40/litespeed/debian`.
|
## Repositories wired (2026-10-22)
|
||||||
|
|
||||||
|
The script and `keys/pkg-cache/` are **canonical here**; every other repo carries byte-identical copies (`sha256sum scripts/pkg-cache-repos.sh` to compare). Change it here first, then sync. Same for `.gitea/scripts/resolve-base-image.sh`.
|
||||||
|
|
||||||
|
| Repo | Image(s) | Bases | Through the cache | Base digest-pinned |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| cloud-apache-container | cac, cac-fpm, shared-httpd (almalinux/10-base); shared-ols, cac-litespeed, cac-lsphp (litespeedtech/openlitespeed) | Docker Hub | AlmaLinux/EPEL/Remi (rpm); Ubuntu + LiteSpeed (apt) | yes, all 6 jobs |
|
||||||
|
| cloud-node-container | cnoc:node18..26 | almalinux/10-base | AlmaLinux/EPEL + NodeSource (`nodesource N`) | yes |
|
||||||
|
| cloud-memcached-container | cmc | almalinux/9-base | AlmaLinux 9 + EPEL 9 | yes |
|
||||||
|
| cloud-haproxy-container | chc | almalinux/9-base | AlmaLinux 9 + EPEL 9 (inotify-tools GitHub tarball direct) | yes |
|
||||||
|
| whp-default-container | whp-default | httpd:alpine | nothing to install (mirror only) | yes |
|
||||||
|
| versitygw-container | versitygw | ubuntu:latest | Ubuntu (versitygw .deb from GitHub direct) | yes |
|
||||||
|
| haproxy-manager-base | haproxy-manager-base, coraza-spoa | repo.anhonesthost.net python:3.12-slim / golang:1.25 (not Docker Hub: no mirror); gcr.io distroless | Debian (apt) + Go modules (`go-env`); pip direct | n/a; `mirror-base-image.yaml` now copies Docker Hub images by the digest resolved directly from Docker Hub |
|
||||||
|
| cpanel-importer | cpanel-importer | almalinux:10-minimal | AlmaLinux/EPEL/Remi — **PR #1 open, not merged** (pending rebase onto the PHP 8.5 work) | in the PR |
|
||||||
|
|
||||||
|
Not image builds (nothing to wire): kb-anhonesthost, anhonesthost-blog, dao-mail-signup, renovate-runner. ols-mail-client builds images in CI only for scanning/smoke tests (never pushed), its bases are already digest-pinned, and they install no OS packages.
|
||||||
|
|
||||||
|
## Adding a new upstream
|
||||||
|
|
||||||
|
1. On CT130: back up, then add the prefix to `UPSTREAMS` in `/usr/local/sbin/pkgcache-gen-nginx` (origin first; add a mirror tier only if you measured it is as fresh as the origin). If its mutable metadata isn't covered by `META_RE`, extend it there AND in `/usr/local/sbin/pkgcache-refresh`. Add the prefix to the `location = /` text in `/etc/nginx/pkgcache/server-common.conf`.
|
||||||
|
2. `pkgcache-gen-nginx > /etc/nginx/sites-available/pkgcache && nginx -t && systemctl reload nginx` (`pct exec` has no /usr/local/sbin in PATH: use full paths). Verify old and new prefixes with `curl --cacert keys/pkg-cache/ca.crt https://192.168.1.40/<prefix>/...` (look at `X-Cache-Status`/`X-Pkgcache-Tier`). CT130 has no egress filter, so no firewall change is needed for new origins.
|
||||||
|
3. Only proxy upstreams whose content the CLIENT verifies end to end (GPG-signed packages/metadata, Go sumdb, content digests). Commit any signing key under `keys/pkg-cache/` with its fingerprint and provenance in the README.
|
||||||
|
4. Teach `scripts/pkg-cache-repos.sh` the rewrite (keep the origin as a fallback where the client supports it), test through the cache from a runner-network host, then sync the copies.
|
||||||
|
|
||||||
## Trust model
|
## Trust model
|
||||||
|
|
||||||
@@ -149,6 +188,35 @@ Remaining risks:
|
|||||||
# /etc/docker/daemon.json: { "registry-mirrors": ["https://192.168.1.40:5000"] } then restart docker
|
# /etc/docker/daemon.json: { "registry-mirrors": ["https://192.168.1.40:5000"] } then restart docker
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Base-image digest pinning (2026-10-22)
|
||||||
|
|
||||||
|
Gap closed (security review): with the BuildKit mirror on, `FROM almalinux/10-base`
|
||||||
|
was resolved **by tag through the cache**, so a compromised cache could hand out a
|
||||||
|
different image for that tag.
|
||||||
|
|
||||||
|
Now every job that uses the mirror first runs **"Resolve base image digest (Docker
|
||||||
|
Hub, direct)"**:
|
||||||
|
- `.gitea/scripts/resolve-base-image.sh IMAGE:TAG` gets an anonymous pull token from
|
||||||
|
`auth.docker.io` and sends a `HEAD /v2/<repo>/manifests/<tag>` to
|
||||||
|
`registry-1.docker.io` over HTTPS (never the mirror; HEADs don't count against the
|
||||||
|
pull rate limit). It prints `IMAGE@sha256:<index digest>`. Input and output are
|
||||||
|
regex-validated; values reach `run:` only via `env:`.
|
||||||
|
- The job passes `BASE_IMAGE=<that>` as a build arg; the Dockerfiles say
|
||||||
|
`ARG BASE_IMAGE=<tag>` / `FROM ${BASE_IMAGE}`. The mirror can then only serve
|
||||||
|
content-addressed manifests/blobs, which BuildKit verifies against the digest.
|
||||||
|
- **Lookup fails:** `BASE_IMAGE` falls back to the tag, the probe step does **not**
|
||||||
|
enable the registry mirror (`registry-mirror=<not used: Docker Hub direct>`), and
|
||||||
|
the tag is pulled straight from Docker Hub, as before the cache existed. The
|
||||||
|
package-repo cache (`PKG_CACHE`) is unaffected, since its content is GPG-checked.
|
||||||
|
- Freshness is automatic: the digest is looked up on every run, nothing is
|
||||||
|
hard-coded. Local builds without the arg use the tag.
|
||||||
|
- Log lines to look for: `base-image: almalinux/10-base:latest -> almalinux/10-base@sha256:...`
|
||||||
|
and `pkg-cache: repos=https://192.168.1.40 registry-mirror=192.168.1.40:5000`.
|
||||||
|
|
||||||
|
Applied to every job here (Build-and-Push, FPM, Shared-httpd, Shared-OLS, LiteSpeed, LSPHP) and to every other repo with a Docker Hub base (see "Repositories wired").
|
||||||
|
The script is canonical here (`.gitea/scripts/resolve-base-image.sh`); other repos
|
||||||
|
carry byte-identical copies.
|
||||||
|
|
||||||
## WHP hosts (`scripts/host/pkgcache-host-repos.sh`)
|
## WHP hosts (`scripts/host/pkgcache-host-repos.sh`)
|
||||||
|
|
||||||
`pkgcache-host-repos.sh apply https://192.168.1.40` does the following:
|
`pkgcache-host-repos.sh apply https://192.168.1.40` does the following:
|
||||||
|
|||||||
@@ -9,5 +9,13 @@
|
|||||||
# binary has the same LSAPI_* feature/env-name set as the packaged lsphp, so a
|
# binary has the same LSAPI_* feature/env-name set as the packaged lsphp, so a
|
||||||
# LiteSpeed SAPI upgrade we have not pinned yet fails the build instead of
|
# LiteSpeed SAPI upgrade we have not pinned yet fails the build instead of
|
||||||
# shipping an older SAPI.
|
# shipping an older SAPI.
|
||||||
|
#
|
||||||
|
# RE-PINNED 2026-11-19 (emergency run 5686): LiteSpeed's lsphp 8.2-8.5 `-2+noble`
|
||||||
|
# packages (e.g. lsphp85 8.5.12-2) now carry LSAPI_ENABLE_ADMIN_OVERRIDE and the
|
||||||
|
# string "LiteSpeed V8.4" (the 8.3 tgz above this line had neither; the name-set gate
|
||||||
|
# caught it). php-litespeed-8.4.tgz (Last-Modified Tue, 17 Nov 2026 17:12:52 GMT)
|
||||||
|
# is the SAPI with that knob (hardening: admin overrides off by default, 64-bit safe
|
||||||
|
# writes). Measured against the packaged binaries before re-pinning. The previous
|
||||||
|
# pin was php-litespeed-8.3.tgz cd616b82cc853e5e3187fccd060228b9cd1a2009ce72d8da5950eef950ac29b1.
|
||||||
# <url> <sha256>
|
# <url> <sha256>
|
||||||
https://www.litespeedtech.com/packages/lsapi/php-litespeed-8.3.tgz cd616b82cc853e5e3187fccd060228b9cd1a2009ce72d8da5950eef950ac29b1
|
https://www.litespeedtech.com/packages/lsapi/php-litespeed-8.4.tgz d88e90ef010e06e368da6919b700a589a9a4f478ebb7b2dc41f8d87b4e3f9b8f
|
||||||
@@ -18,3 +18,15 @@ RPM-GPG-KEY-remi2024 Remi's RPM repository 2024 CF1D F005 7CE8 5DFF 5B2F 2A37
|
|||||||
Remi rotates keys (remi2025, ...): when remi-release starts being
|
Remi rotates keys (remi2025, ...): when remi-release starts being
|
||||||
signed by a new key, `release-install remi` fails loudly - add the
|
signed by a new key, `release-install remi` fails loudly - add the
|
||||||
new key here (and to pkg-cache-repos.sh).
|
new key here (and to pkg-cache-repos.sh).
|
||||||
|
RPM-GPG-KEY-EPEL-9 Fedora (epel9) FF8A D134 4597 106E CE81 3B91 8A38 72BF 3228 467C
|
||||||
|
fetched 2026-10-22 over HTTPS from dl.fedoraproject.org and
|
||||||
|
mirror.math.princeton.edu (identical); used by `release-install epel`
|
||||||
|
on EL9 images (cloud-memcached-container, cloud-haproxy-container).
|
||||||
|
RPM-GPG-KEY-nodesource Nodesource Operations <operations@nodesource.com>
|
||||||
|
242B 8138 31AF 0956 2B6C 46F7 6B88 DA4E 3AF2 8A14 (rsa4096, 2023-12-22)
|
||||||
|
fetched 2026-10-22 over HTTPS from
|
||||||
|
https://rpm.nodesource.com/gpgkey/ns-operations-public.key (the key
|
||||||
|
NodeSource's own setup_N.x scripts reference); verified by dnf
|
||||||
|
gpgcheck against the nodejs RPMs. Not on keys.openpgp.org /
|
||||||
|
keyserver.ubuntu.com - confirm out of band. Used by
|
||||||
|
`pkg-cache-repos.sh nodesource MAJOR` (cloud-node-container).
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
mQINBGE3mOsBEACsU+XwJWDJVkItBaugXhXIIkb9oe+7aadELuVo0kBmc3HXt/Yp
|
||||||
|
CJW9hHEiGZ6z2jwgPqyJjZhCvcAWvgzKcvqE+9i0NItV1rzfxrBe2BtUtZmVcuE6
|
||||||
|
2b+SPfxQ2Hr8llaawRjt8BCFX/ZzM4/1Qk+EzlfTcEcpkMf6wdO7kD6ulBk/tbsW
|
||||||
|
DHX2lNcxszTf+XP9HXHWJlA2xBfP+Dk4gl4DnO2Y1xR0OSywE/QtvEbN5cY94ieu
|
||||||
|
n7CBy29AleMhmbnx9pw3NyxcFIAsEZHJoU4ZW9ulAJ/ogttSyAWeacW7eJGW31/Z
|
||||||
|
39cS+I4KXJgeGRI20RmpqfH0tuT+X5Da59YpjYxkbhSK3HYBVnNPhoJFUc2j5iKy
|
||||||
|
XLgkapu1xRnEJhw05kr4LCbud0NTvfecqSqa+59kuVc+zWmfTnGTYc0PXZ6Oa3rK
|
||||||
|
44UOmE6eAT5zd/ToleDO0VesN+EO7CXfRsm7HWGpABF5wNK3vIEF2uRr2VJMvgqS
|
||||||
|
9eNwhJyOzoca4xFSwCkc6dACGGkV+CqhufdFBhmcAsUotSxe3zmrBjqA0B/nxIvH
|
||||||
|
DVgOAMnVCe+Lmv8T0mFgqZSJdIUdKjnOLu/GRFhjDKIak4jeMBMTYpVnU+HhMHLq
|
||||||
|
uDiZkNEvEEGhBQmZuI8J55F/a6UURnxUwT3piyi3Pmr2IFD7ahBxPzOBCQARAQAB
|
||||||
|
tCdGZWRvcmEgKGVwZWw5KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAk4EEwEI
|
||||||
|
ADgWIQT/itE0RZcQbs6BO5GKOHK/MihGfAUCYTeY6wIbDwULCQgHAgYVCgkICwIE
|
||||||
|
FgIDAQIeAQIXgAAKCRCKOHK/MihGfFX/EACBPWv20+ttYu1A5WvtHJPzwbj0U4yF
|
||||||
|
3zTQpBglQ2UfkRpYdipTlT3Ih6j5h2VmgRPtINCc/ZE28adrWpBoeFIS2YAKOCLC
|
||||||
|
nZYtHl2nCoLq1U7FSttUGsZ/t8uGCBgnugTfnIYcmlP1jKKA6RJAclK89evDQX5n
|
||||||
|
R9ZD+Cq3CBMlttvSTCht0qQVlwycedH8iWyYgP/mF0W35BIn7NuuZwWhgR00n/VG
|
||||||
|
4nbKPOzTWbsP45awcmivdrS74P6mL84WfkghipdmcoyVb1B8ZP4Y/Ke0RXOnLhNe
|
||||||
|
CfrXXvuW+Pvg2RTfwRDtehGQPAgXbmLmz2ZkV69RGIr54HJv84NDbqZovRTMr7gL
|
||||||
|
9k3ciCzXCiYQgM8yAyGHV0KEhFSQ1HV7gMnt9UmxbxBE2pGU7vu3CwjYga5DpwU7
|
||||||
|
w5wu1TmM5KgZtZvuWOTDnqDLf0cKoIbW8FeeCOn24elcj32bnQDuF9DPey1mqcvT
|
||||||
|
/yEo/Ushyz6CVYxN8DGgcy2M9JOsnmjDx02h6qgWGWDuKgb9jZrvRedpAQCeemEd
|
||||||
|
fhEs6ihqVxRFl16HxC4EVijybhAL76SsM2nbtIqW1apBQJQpXWtQwwdvgTVpdEtE
|
||||||
|
r4ArVJYX5LrswnWEQMOelugUG6S3ZjMfcyOa/O0364iY73vyVgaYK+2XtT2usMux
|
||||||
|
VL469Kj5m13T6w==
|
||||||
|
=Mjs/
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
mQINBGWFsqMBEAC4YlSuNpHjOiQVTC8StolVx3J8E9SC6G4wmVWbytMD1Zivfanj
|
||||||
|
3LKDqdy7vpbViXA9whpyGQgQYdOlPKaNHWw4GSeGTnP1FbvaK1NJ9MnAzUysh49R
|
||||||
|
cqoktYeIQbqgOgZHw5/gVH5bYObf1KJQ2LY/je9WTlW3QMRe1TaW0F0AZnJMBIOG
|
||||||
|
JllE33QIpxDnOQHnvdUGq+HscUOTrW4Q3AdzwsQxU4GX82d9qFFr8HjAmUjlUKyh
|
||||||
|
PgvMpb8VDvR7NE6et+wWh6BMYILo3VJFP7/gTXGiy3WWs5GW/PNXIXw5/f2w1B+e
|
||||||
|
Dh5tlfGG4q/4P8mbv7C6RPHoF2Lq+W69HLqSq/l42WUL41tHlFTsluCIKpeeMxAu
|
||||||
|
olxx3Z5momHMMyh7rbZtQDqFMTAqxNjT1NinKkWyj7KP5WE9hVosyd3UMR4UYDMm
|
||||||
|
Zb6LI4N7Hht887+CY7grxTJ9cGQhMFfvLyvlf/FWQY4S6G7sEaUV71N9StvXBNG/
|
||||||
|
iNoIMzhwjBmrmvT/UGPkLSi0SIBOxeGw2rwngnYikIJxuTQ4V40lm8o6eMFca7rW
|
||||||
|
BQvAEncV8pvi/3FqrUBZ/U53s7NO24hBDoaQPzFbVCw0GHHf9GD7KoQb5c9ONoCZ
|
||||||
|
Qu2YWo7ajPLzl/h2pJ2Kn29Ywev9MpuuPTGvifiKilcBVLYP3ZJg4ZfRBwARAQAB
|
||||||
|
tDFOb2Rlc291cmNlIE9wZXJhdGlvbnMgPG9wZXJhdGlvbnNAbm9kZXNvdXJjZS5j
|
||||||
|
b20+iQJOBBMBCgA4FiEEJCuBODGvCVYrbEb3a4jaTjryihQFAmWFsqMCGwMFCwkI
|
||||||
|
BwIGFQoJCAsCBBYCAwECHgECF4AACgkQa4jaTjryihTD+hAAtTU155ke7xmnT0ph
|
||||||
|
odbGjm3mOGdkdaDH+xmWtPtufiPncgHMCYh4aIDRloog8rFE+pP3qfwJmUKxthwD
|
||||||
|
drrLAzfUwOrGxPnYH3MWwg66RVVoiiU+Hh42gJTez+P/K0VMQZXH0XTZD96TiwT/
|
||||||
|
S0+WvQPuJ9pda2L4cjV+YP2+m0ERUG9QPj0Shgw+/PWCGWKD6J9DRToiwfwCTOvc
|
||||||
|
DNolF1EcRlfPMTsqI2Bdc+TQywqU1Py1MUDSAPXxdK6nW2oM7eC5l3XXefcQ6JOS
|
||||||
|
AuNdEDIsaf+H76j6/wSGsuIcJjUo9wmKjEV1iJYwT6jLbjaVQxXgEPHBSb+kzanx
|
||||||
|
FWyrYP6TZpeY2gT4bBMsOKd7ay1I3/nIHwe6x8Yzkqzz+7YVhNpMbybH72NTxDWQ
|
||||||
|
UmiboJs9r7j1lkHlBjxU9RLF5laYSeCIXD62KQVoP5ao1LSPKsCXFqcdpUgLYtRv
|
||||||
|
CXxdriiHp4m9eGzbS7RW1TLm6tMOKbI4LzOtMm4DoZzGD2FTfsUtn6ALx9FSgvl/
|
||||||
|
VMlzqZes+rclcukACtutvtB8e0yRhuzPUN56ctLEZfI1XzQFoN8Vdj6HWtiXWRiJ
|
||||||
|
EohuufE2cEebmX90NRsbh4KAFXNEQROlMeMf7ufuSsk7QXLTutxmWSQvWwyS+P5/
|
||||||
|
ZqCapIDlRCJFZX4N9a1IXo0OgCC5Ag0EZYWyowEQAKz7sA6WBKFVcmzcyr6y9TI5
|
||||||
|
RemnzotRUdqXj8tD70xvV1nBEf+BfTw3hsiV019ZboPBae+cRaD4plQbNb0du/+Q
|
||||||
|
UFq4ja055ZEld01RqE49L562pWvA5cwSmjs9+ZMI1ja0HbTb2K4razpzX3be+Zul
|
||||||
|
TbH20X5FHTz+Jyfmw+G3Y9okw3OIzuYo16Lv/Qs8VoBmj01PItzq8dX5wJiIlVxU
|
||||||
|
8wKHKy1kiKGCgyPnvqcXCGen0EoUS9wsWK1QHfryscYGVF9y1TBQvJa9HIpWPrIZ
|
||||||
|
slSiVS4tQhGHfLDVlaDsYFrH9SIUkvW7peSEiPE1TKQjvbMS3CcUZRaMcGfgyDPe
|
||||||
|
gXwnNwZbJ2/cisXbdAJaGT49V1Y+Sc1oKSGSG4FaGUNhS3p3cB7qlX2zS/sR2ael
|
||||||
|
90fXR6nhjvhMAS98i7663pCUv9q0Z/NXNZwdXjbSF4W8gq3PVt7hCnJrngsGSkGu
|
||||||
|
Qz0dc227/sAjh9CxYm8kQqUuQtiPVfKwkcUUT+O7jr2/6eAXZbTYVZbvaLEGMrKA
|
||||||
|
bdWKpZMMOKAI45f+ZAcEmJG4D68N0jzVrLCXMuuLq/yqqyEmxDjSOH0qVutl8jxg
|
||||||
|
vfxPxKYX8nnAzJZJHGHmV/ihjfClSdYePKExHuFVVhvc4BxE1XfPUeCZG4JpB9/B
|
||||||
|
gNCiDPsg4JIw6GO5LS2xABEBAAGJAjYEGAEKACAWIQQkK4E4Ma8JVitsRvdriNpO
|
||||||
|
OvKKFAUCZYWyowIbDAAKCRBriNpOOvKKFOTKD/40WN6ZRfP6hVLAX26DdyN9Bqzg
|
||||||
|
D+0hJilmHL1YFeLt9U/YPhOZJxPaDGrMfldC0FSXKKr7H5C7FQErl936108wGohz
|
||||||
|
53KGbNid0crNeaWrQuWk3QjaMF62Yc+NVB8b5LoEk0TEt9KPO6kveYDtW6Ygkw9i
|
||||||
|
5aaS/AC+8GChOH6lWhLHcO91T7+Hi5qRez7qyme/AlHUTV9/jE6JgFJ7thCCAqBQ
|
||||||
|
AfX3mGFlTwSTMHDeYq81MMl9UhYgoFJtx8PuqmSV7Eb29ccJofz3J+b5OJvpmLSZ
|
||||||
|
Hu22Csa8k2V/1ojeL0DjQHD06V75F7BerxLR/rbJ64GkIiOdm4ntXC4a335gjQfM
|
||||||
|
5tI6LtGsIpr+Le4C068eDj7YpzS0ql3g6o4A1TbtapLccgEj4iw95H4KKh0Ro5r0
|
||||||
|
0s6LoSLu9uva3LiLVn6xXvpw3iv8FnhTr5PEiPnorXvxcCnUrB3Rkk6Wh1SKjpxa
|
||||||
|
u6KiFzH0CXR1AgUdWSC0rAmvEdFjXgaoQd+Z2eJFHEAsg91URd9NtdeDsyMwdbHh
|
||||||
|
iBZPGX5ddPjJA7nwKbkibCv7xiodd9ph8NmGLqD/2SDU1rqvPuCDMqLuxc89Gvhs
|
||||||
|
3CeLTSJK9Uzb3oNdZLxL8CECip1ZkowVfTL+jY23phS9+Z0Db/yZqot3ZZJAAG8g
|
||||||
|
oSVkzT/Mwp9zFVQu5w==
|
||||||
|
=drMP
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
Executable
+90
@@ -0,0 +1,90 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Assemble the multi-arch index tag(s) from per-platform images that were
|
||||||
|
# already pushed BY DIGEST (no tag). Used by the trusted x86 publish job
|
||||||
|
# (copied verbatim from haproxy-manager-base PR #17; see its build-push-coraza.yaml; template for the other WHP
|
||||||
|
# image repos, docs/arm64/IMAGE-PIPELINE-PLAN.md section 4.1/4.4).
|
||||||
|
#
|
||||||
|
# assemble-multiarch-index.sh \
|
||||||
|
# --amd64 sha256:<digest> \
|
||||||
|
# --arm64 sha256:<digest> --arm64-outcome success|failure|cancelled|skipped \
|
||||||
|
# --repo <registry/path> [--repo <other registry/path> ...] \
|
||||||
|
# --tag <tag> [--tag <tag> ...] [--builder <buildx builder>]
|
||||||
|
#
|
||||||
|
# Rules (all enforced here so the workflow stays thin and these are testable):
|
||||||
|
# * amd64 is mandatory. A missing/malformed amd64 digest, or an amd64 digest
|
||||||
|
# that does not inspect as linux/amd64, aborts with exit 1 and publishes
|
||||||
|
# NOTHING (the same "build failed, no tag" outcome as before multi-arch).
|
||||||
|
# * arm64 is attached ONLY when its step outcome is exactly "success" AND the
|
||||||
|
# digest is well-formed AND it inspects as linux/arm64. Otherwise the tag is
|
||||||
|
# published amd64-only (warning, exit 0). The arm64 digest must come from
|
||||||
|
# THIS run's step output - the workflow never reads it from a registry tag,
|
||||||
|
# so a previous build's arm64 can never be re-attached to a newer amd64.
|
||||||
|
# * every --tag is created in every --repo from <repo>@<digest> sources in
|
||||||
|
# that same repo (both digests were pushed to every --repo by the build).
|
||||||
|
#
|
||||||
|
# Env: IMAGETOOLS overrides the command (default: "docker buildx imagetools");
|
||||||
|
# the test suite points it at a stub.
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
IMAGETOOLS=${IMAGETOOLS:-docker buildx imagetools}
|
||||||
|
amd64=""; arm64=""; outcome="skipped"; builder=""
|
||||||
|
repos=(); tags=()
|
||||||
|
|
||||||
|
die() { echo "assemble-multiarch-index: $*" >&2; exit 1; }
|
||||||
|
warn() { echo "::warning::assemble-multiarch-index: $*"; }
|
||||||
|
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
case "$1" in
|
||||||
|
--amd64) amd64=${2-}; shift 2 ;;
|
||||||
|
--arm64) arm64=${2-}; shift 2 ;;
|
||||||
|
--arm64-outcome) outcome=${2-}; shift 2 ;;
|
||||||
|
--repo) repos+=("${2-}"); shift 2 ;;
|
||||||
|
--tag) tags+=("${2-}"); shift 2 ;;
|
||||||
|
--builder) builder=${2-}; shift 2 ;;
|
||||||
|
*) die "unknown argument: $1" ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
re='^sha256:[0-9a-f]{64}$'
|
||||||
|
[ ${#repos[@]} -gt 0 ] || die "need at least one --repo"
|
||||||
|
[ ${#tags[@]} -gt 0 ] || die "need at least one --tag"
|
||||||
|
[[ $amd64 =~ $re ]] || die "amd64 digest missing or malformed ('$amd64'); refusing to publish"
|
||||||
|
|
||||||
|
bflag=(); [ -n "$builder" ] && bflag=(--builder "$builder")
|
||||||
|
|
||||||
|
# arch_of <ref>: prints the image config's architecture ("" on any failure).
|
||||||
|
arch_of() {
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
$IMAGETOOLS inspect "${bflag[@]}" "$1" --format '{{json .Image}}' 2>/dev/null \
|
||||||
|
| python3 -I -c 'import json,sys; print(json.load(sys.stdin).get("architecture",""))' 2>/dev/null || true
|
||||||
|
}
|
||||||
|
|
||||||
|
for r in "${repos[@]}"; do
|
||||||
|
[ "$(arch_of "$r@$amd64")" = amd64 ] || die "$r@$amd64 does not inspect as linux/amd64; refusing to publish"
|
||||||
|
done
|
||||||
|
|
||||||
|
use_arm64=0
|
||||||
|
if [ "$outcome" != success ]; then
|
||||||
|
warn "arm64 step outcome is '$outcome': publishing amd64-only (no arm64 digest is carried over)"
|
||||||
|
elif ! [[ $arm64 =~ $re ]]; then
|
||||||
|
warn "arm64 step reported success but its digest is missing/malformed: publishing amd64-only"
|
||||||
|
elif [ "$arm64" = "$amd64" ]; then
|
||||||
|
warn "arm64 digest equals the amd64 digest: publishing amd64-only"
|
||||||
|
else
|
||||||
|
use_arm64=1
|
||||||
|
for r in "${repos[@]}"; do
|
||||||
|
if [ "$(arch_of "$r@$arm64")" != arm64 ]; then
|
||||||
|
warn "$r@$arm64 does not inspect as linux/arm64: publishing amd64-only"
|
||||||
|
use_arm64=0; break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
for r in "${repos[@]}"; do
|
||||||
|
targs=(); for t in "${tags[@]}"; do targs+=(-t "$r:$t"); done
|
||||||
|
srcs=("$r@$amd64"); [ "$use_arm64" = 1 ] && srcs+=("$r@$arm64")
|
||||||
|
echo "assemble-multiarch-index: $r tags=${tags[*]} sources=${#srcs[@]} ($([ "$use_arm64" = 1 ] && echo 'amd64+arm64' || echo 'amd64-only'))"
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
$IMAGETOOLS create "${bflag[@]}" "${targs[@]}" "${srcs[@]}"
|
||||||
|
done
|
||||||
|
echo "platforms=$([ "$use_arm64" = 1 ] && echo linux/amd64,linux/arm64 || echo linux/amd64)"
|
||||||
Executable
+55
@@ -0,0 +1,55 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# CVE-2026-119618 (mod_http2 assign_headers heap corruption, httpd 2.4.55-2.4.70)
|
||||||
|
# defense in depth. Nothing in WHP needs HTTP/2 or mod_md inside a container: the
|
||||||
|
# HAProxy edge terminates h2/h3 and speaks HTTP/1.1 to backends, and certificates
|
||||||
|
# come from the edge, not mod_md. So the modules are removed from every
|
||||||
|
# Alma-based Apache image and this gate fails the build if they ever come back.
|
||||||
|
#
|
||||||
|
# httpd-h2-md-gate.sh remove uninstall mod_http2 / mod_md RPMs (if present)
|
||||||
|
# httpd-h2-md-gate.sh check fail unless the modules cannot load, `httpd -t`
|
||||||
|
# passes, and record the httpd version
|
||||||
|
#
|
||||||
|
# Both are idempotent and safe on images with no Apache at all (a no-op).
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
BAD_MODULES='http2_module|proxy_http2_module|md_module'
|
||||||
|
MOD_PKGS='mod_http2 mod_md'
|
||||||
|
|
||||||
|
cmd_remove() {
|
||||||
|
local p present=()
|
||||||
|
for p in $MOD_PKGS; do
|
||||||
|
rpm -q "$p" >/dev/null 2>&1 && present+=("$p")
|
||||||
|
done
|
||||||
|
if [ "${#present[@]}" -gt 0 ]; then
|
||||||
|
dnf remove -y "${present[@]}"
|
||||||
|
fi
|
||||||
|
# Belt and braces if a package was removed but a module file was left behind.
|
||||||
|
rm -f /etc/httpd/conf.modules.d/10-h2.conf /etc/httpd/conf.modules.d/10-proxy_h2.conf \
|
||||||
|
/etc/httpd/conf.modules.d/*-md.conf \
|
||||||
|
/usr/lib64/httpd/modules/mod_http2.so /usr/lib64/httpd/modules/mod_proxy_http2.so \
|
||||||
|
/usr/lib64/httpd/modules/mod_md.so
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd_check() {
|
||||||
|
local p mods v fail=0
|
||||||
|
command -v httpd >/dev/null 2>&1 || { echo "gate: no httpd binary" >&2; exit 1; }
|
||||||
|
for p in $MOD_PKGS; do
|
||||||
|
if rpm -q "$p" >/dev/null 2>&1; then echo "gate FAIL: RPM $p is installed" >&2; fail=1; fi
|
||||||
|
done
|
||||||
|
# Anchored on the module name column ("systemd_module" must NOT match md_module).
|
||||||
|
mods=$(httpd -M 2>/dev/null) || { echo "gate FAIL: httpd -M failed" >&2; exit 1; }
|
||||||
|
if printf '%s\n' "$mods" | grep -E "^ (${BAD_MODULES}) "; then
|
||||||
|
echo "gate FAIL: HTTP/2 or mod_md module still loadable" >&2; fail=1
|
||||||
|
fi
|
||||||
|
[ "$fail" -eq 0 ] || exit 1
|
||||||
|
httpd -t
|
||||||
|
v=$(rpm -q --qf '%{VERSION}-%{RELEASE}' httpd-core)
|
||||||
|
printf '%s\n' "$v" > /etc/whp-httpd-version
|
||||||
|
echo "gate OK: httpd-core ${v}; no http2/proxy_http2/md modules; httpd -t passes"
|
||||||
|
}
|
||||||
|
|
||||||
|
case "${1:-}" in
|
||||||
|
remove) cmd_remove ;;
|
||||||
|
check) cmd_check ;;
|
||||||
|
*) echo "usage: $0 remove|check" >&2; exit 2 ;;
|
||||||
|
esac
|
||||||
Executable
+103
@@ -0,0 +1,103 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## image-label-amd64.sh REF LABEL [LABEL...]
|
||||||
|
##
|
||||||
|
## Prints the value of each LABEL (one per line, empty line if the label is
|
||||||
|
## absent) from the *linux/amd64* image behind REF, whether REF is a plain
|
||||||
|
## single-platform manifest, an OCI image index (attestation children are
|
||||||
|
## ignored) or a Docker manifest list.
|
||||||
|
##
|
||||||
|
## Why: `imagetools inspect REF --format '{{ index .Image.Config.Labels ... }}'`
|
||||||
|
## is only meaningful for a single-platform image; on a multi-arch index `.Image`
|
||||||
|
## is platform-keyed / unavailable depending on the buildx version, and the old
|
||||||
|
## callers swallowed the error (fail-open). This resolves the amd64 child
|
||||||
|
## digest from the raw index, then inspects that child directly.
|
||||||
|
##
|
||||||
|
## Exit: 0 labels printed; 3 REF does not exist in the registry (not found);
|
||||||
|
## 1 anything else (network/auth error, malformed manifest, no amd64
|
||||||
|
## image, config is not amd64, ...) with a clear message on stderr.
|
||||||
|
## Env: IMAGETOOLS overrides "docker buildx imagetools" (tests use a stub).
|
||||||
|
set -euo pipefail
|
||||||
|
IMAGETOOLS=${IMAGETOOLS:-docker buildx imagetools}
|
||||||
|
die() { echo "image-label-amd64: $*" >&2; exit 1; }
|
||||||
|
[ $# -ge 2 ] || die "usage: image-label-amd64.sh REF LABEL [LABEL...]"
|
||||||
|
ref=$1; shift
|
||||||
|
|
||||||
|
# Run an imagetools command; map "tag/manifest does not exist" to exit 3.
|
||||||
|
it() {
|
||||||
|
local out err rc=0
|
||||||
|
err=$(mktemp); trap 'rm -f "$err"' RETURN
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
out=$($IMAGETOOLS "$@" 2>"$err") || rc=$?
|
||||||
|
if [ "$rc" -ne 0 ]; then
|
||||||
|
if grep -qiE 'not found|manifest unknown|name unknown|: 404' "$err"; then
|
||||||
|
echo "image-label-amd64: $ref: not found ($(head -c 300 "$err" | tr '\n' ' '))" >&2
|
||||||
|
return 3
|
||||||
|
fi
|
||||||
|
echo "image-label-amd64: imagetools $1 failed (rc=$rc): $(head -c 300 "$err" | tr '\n' ' ')" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
printf '%s' "$out"
|
||||||
|
}
|
||||||
|
|
||||||
|
rc=0; raw=$(it inspect --raw "$ref") || rc=$?
|
||||||
|
[ "$rc" -eq 0 ] || exit "$rc"
|
||||||
|
|
||||||
|
# Classify and, for an index, pick the single linux/amd64 child digest.
|
||||||
|
rc=0
|
||||||
|
verdict=$(printf '%s' "$raw" | python3 -I -c '
|
||||||
|
import json, sys
|
||||||
|
try:
|
||||||
|
d = json.load(sys.stdin)
|
||||||
|
except Exception as e:
|
||||||
|
print("ERR not JSON: %s" % e); sys.exit(0)
|
||||||
|
if not isinstance(d, dict):
|
||||||
|
print("ERR manifest is not a JSON object"); sys.exit(0)
|
||||||
|
mt = d.get("mediaType", "")
|
||||||
|
if isinstance(d.get("manifests"), list):
|
||||||
|
kids = [m for m in d["manifests"] if isinstance(m, dict)
|
||||||
|
and isinstance(m.get("platform"), dict)
|
||||||
|
and m["platform"].get("os") == "linux"
|
||||||
|
and m["platform"].get("architecture") == "amd64"
|
||||||
|
and "vnd.docker.reference.type" not in (m.get("annotations") or {})]
|
||||||
|
digs = [m.get("digest", "") for m in kids]
|
||||||
|
if len(digs) != 1:
|
||||||
|
print("ERR index has %d linux/amd64 images (need exactly 1)" % len(digs)); sys.exit(0)
|
||||||
|
if not digs[0].startswith("sha256:") or len(digs[0]) != 71:
|
||||||
|
print("ERR malformed amd64 child digest %r" % digs[0]); sys.exit(0)
|
||||||
|
print("INDEX " + digs[0])
|
||||||
|
elif isinstance(d.get("config"), dict) and isinstance(d.get("layers"), list):
|
||||||
|
print("SINGLE")
|
||||||
|
else:
|
||||||
|
print("ERR neither an image index nor an image manifest (mediaType=%r)" % mt)
|
||||||
|
') || rc=$?
|
||||||
|
[ "$rc" -eq 0 ] || die "could not parse manifest of $ref"
|
||||||
|
case "$verdict" in
|
||||||
|
ERR*) die "$ref: ${verdict#ERR }" ;;
|
||||||
|
SINGLE) target=$ref ;;
|
||||||
|
INDEX\ *)
|
||||||
|
base=${ref%%@*}
|
||||||
|
last=${base##*/}
|
||||||
|
[[ $last == *:* ]] && base=${base%:"${last#*:}"}
|
||||||
|
target="$base@${verdict#INDEX }" ;;
|
||||||
|
*) die "$ref: unexpected parser output" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
rc=0; cfg=$(it inspect "$target" --format '{{json .Image}}') || rc=$?
|
||||||
|
[ "$rc" -eq 0 ] || { [ "$rc" -eq 3 ] && die "$target: not found although listed by the index"; exit "$rc"; }
|
||||||
|
|
||||||
|
printf '%s' "$cfg" | python3 -I -c '
|
||||||
|
import json, sys
|
||||||
|
try:
|
||||||
|
c = json.load(sys.stdin)
|
||||||
|
except Exception as e:
|
||||||
|
sys.stderr.write("image-label-amd64: image config is not JSON: %s\n" % e); sys.exit(1)
|
||||||
|
if not isinstance(c, dict) or c.get("architecture") != "amd64":
|
||||||
|
sys.stderr.write("image-label-amd64: image config is not linux/amd64 (architecture=%r)\n" % (c.get("architecture") if isinstance(c, dict) else None)); sys.exit(1)
|
||||||
|
cfg = c.get("config") or {}
|
||||||
|
labels = cfg.get("Labels") or {}
|
||||||
|
if not isinstance(labels, dict):
|
||||||
|
sys.stderr.write("image-label-amd64: Labels is not an object\n"); sys.exit(1)
|
||||||
|
for name in sys.argv[1:]:
|
||||||
|
v = labels.get(name, "")
|
||||||
|
print(v if isinstance(v, str) else "")
|
||||||
|
' "$@"
|
||||||
Executable
+40
@@ -0,0 +1,40 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## index-platforms.sh REF
|
||||||
|
## Prints "index <os/arch> ..." (real platforms only, attestation children
|
||||||
|
## excluded) when REF is an image index / manifest list, or "single" when it is
|
||||||
|
## a plain single-platform manifest. Exit 3 = REF not found, 1 = any other
|
||||||
|
## failure (fail closed). Used by lsphp-source-emergency.yaml to refuse to
|
||||||
|
## replace a multi-arch tag with an amd64-only one.
|
||||||
|
## Env: IMAGETOOLS overrides "docker buildx imagetools" (tests use a stub).
|
||||||
|
set -euo pipefail
|
||||||
|
IMAGETOOLS=${IMAGETOOLS:-docker buildx imagetools}
|
||||||
|
ref=${1:?usage: index-platforms.sh REF}
|
||||||
|
err=$(mktemp); trap 'rm -f "$err"' EXIT
|
||||||
|
rc=0
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
raw=$($IMAGETOOLS inspect --raw "$ref" 2>"$err") || rc=$?
|
||||||
|
if [ "$rc" -ne 0 ]; then
|
||||||
|
if grep -qiE 'not found|manifest unknown|name unknown|: 404' "$err"; then echo "index-platforms: $ref not found" >&2; exit 3; fi
|
||||||
|
echo "index-platforms: imagetools failed: $(head -c 300 "$err" | tr '\n' ' ')" >&2; exit 1
|
||||||
|
fi
|
||||||
|
printf '%s' "$raw" | python3 -I -c '
|
||||||
|
import json, sys
|
||||||
|
try:
|
||||||
|
d = json.load(sys.stdin)
|
||||||
|
except Exception as e:
|
||||||
|
sys.stderr.write("index-platforms: not JSON: %s\n" % e); sys.exit(1)
|
||||||
|
if isinstance(d, dict) and isinstance(d.get("manifests"), list):
|
||||||
|
ps = []
|
||||||
|
for m in d["manifests"]:
|
||||||
|
p = m.get("platform") if isinstance(m, dict) else None
|
||||||
|
if not isinstance(p, dict) or "vnd.docker.reference.type" in (m.get("annotations") or {}):
|
||||||
|
continue
|
||||||
|
if p.get("os") in (None, "", "unknown") or p.get("architecture") in (None, "", "unknown"):
|
||||||
|
continue
|
||||||
|
ps.append("%s/%s" % (p["os"], p["architecture"]))
|
||||||
|
print("index " + " ".join(sorted(set(ps))))
|
||||||
|
elif isinstance(d, dict) and isinstance(d.get("config"), dict):
|
||||||
|
print("single")
|
||||||
|
else:
|
||||||
|
sys.stderr.write("index-platforms: neither index nor image manifest\n"); sys.exit(1)
|
||||||
|
'
|
||||||
@@ -18,7 +18,8 @@
|
|||||||
## Fails LOUDLY — never ships the base image's PHP by accident:
|
## Fails LOUDLY — never ships the base image's PHP by accident:
|
||||||
## * `apt-get update --error-on=any`: plain `apt-get update` only WARNS when a
|
## * `apt-get update --error-on=any`: plain `apt-get update` only WARNS when a
|
||||||
## repo is unreachable and carries on with no/old lists, exit 0.
|
## repo is unreachable and carries on with no/old lists, exit 0.
|
||||||
## * the LiteSpeed repo must be the candidate source for lsphp${PHPVER}.
|
## * the LiteSpeed repo must be the candidate source for lsphp${PHPVER}
|
||||||
|
## (rpms.litespeedtech.com, or ${PKG_CACHE}/litespeed/ when PKG_CACHE is set).
|
||||||
## * after upgrading, no lsphp${PHPVER}* package may remain upgradable.
|
## * after upgrading, no lsphp${PHPVER}* package may remain upgradable.
|
||||||
## * if CI passed the version it resolved from the repo index (EXPECT_LSPHP_PKG,
|
## * if CI passed the version it resolved from the repo index (EXPECT_LSPHP_PKG,
|
||||||
## EXPECT_PHP_VERSION), the installed package / running PHP must match it;
|
## EXPECT_PHP_VERSION), the installed package / running PHP must match it;
|
||||||
@@ -52,8 +53,18 @@ echo "lsphp-apt-upgrade: base image lsphp${PHPVER}=$(dpkg-query -W -f='${Version
|
|||||||
# Read each output into a variable and match in the shell: piping into an
|
# Read each output into a variable and match in the shell: piping into an
|
||||||
# early-exit reader (grep -q, awk ... exit) under pipefail can SIGPIPE the writer
|
# early-exit reader (grep -q, awk ... exit) under pipefail can SIGPIPE the writer
|
||||||
# and report "missing" for a package that is there (scripts/tests/lsphp-info-probe.test.sh).
|
# and report "missing" for a package that is there (scripts/tests/lsphp-info-probe.test.sh).
|
||||||
|
# With the internal package cache (PKG_CACHE build-arg, scripts/pkg-cache-repos.sh
|
||||||
|
# apt) the LiteSpeed source reads ${PKG_CACHE}/litespeed/... instead; that URL is
|
||||||
|
# accepted ONLY when PKG_CACHE is set, and only under its /litespeed/ path.
|
||||||
MADISON=$(apt-cache madison "lsphp${PHPVER}")
|
MADISON=$(apt-cache madison "lsphp${PHPVER}")
|
||||||
if [[ "$MADISON" != *rpms.litespeedtech.com* ]]; then
|
LS_REPO_OK=0
|
||||||
|
if [[ "$MADISON" == *rpms.litespeedtech.com* ]]; then
|
||||||
|
LS_REPO_OK=1
|
||||||
|
elif [ -n "${PKG_CACHE:-}" ] && [[ "$MADISON" == *"${PKG_CACHE%/}/litespeed/"* ]]; then
|
||||||
|
LS_REPO_OK=1
|
||||||
|
echo "lsphp-apt-upgrade: LiteSpeed repo via package cache ${PKG_CACHE%/}/litespeed/"
|
||||||
|
fi
|
||||||
|
if [ "$LS_REPO_OK" != 1 ]; then
|
||||||
apt-cache policy "lsphp${PHPVER}" >&2 || true
|
apt-cache policy "lsphp${PHPVER}" >&2 || true
|
||||||
die "the LiteSpeed apt repo does not offer lsphp${PHPVER} (repo missing from sources, or its index is empty)."
|
die "the LiteSpeed apt repo does not offer lsphp${PHPVER} (repo missing from sources, or its index is empty)."
|
||||||
fi
|
fi
|
||||||
|
|||||||
Executable
+59
@@ -0,0 +1,59 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
## lsphp-pin-resolve.sh — BUILD-TIME ONLY. Run (Dockerfile RUN is dash, so this is
|
||||||
|
## a bash executable) or source it:
|
||||||
|
## lsphp-pin-resolve.sh resolve PKG WANT # prints the version to pin PKG at
|
||||||
|
## lsphp-pin-resolve.sh ok INSTALLED WANT # exit 0 if INSTALLED is an acceptable pin
|
||||||
|
##
|
||||||
|
## Why: stage 2 of Dockerfile.lsphp pins lsphpNN, lsphpNN-common and
|
||||||
|
## lsphpNN-ldap to the ONE version ext-build compiled against. LiteSpeed's repo
|
||||||
|
## is occasionally published inconsistently (2026-11-19: lsphp84 8.4.27-2+noble
|
||||||
|
## but lsphp84-common 8.4.27-3+noble only), so a single shared pin makes apt say
|
||||||
|
## "Version '8.4.27-2+noble' for 'lsphp84-common' was not found".
|
||||||
|
##
|
||||||
|
## Rule (fail closed, nothing weakened):
|
||||||
|
## 1. WANT itself is offered for PKG -> WANT (the normal case; 82/83/85).
|
||||||
|
## 2. else the highest version that has the SAME upstream PHP version (the
|
||||||
|
## text before the first '-') and the same distro suffix (after '+') as
|
||||||
|
## WANT and is >= WANT (a packaging-revision bump; every lsphp package
|
||||||
|
## Depends on -common only as ">= WANT", so >= is always satisfiable).
|
||||||
|
## 3. else exit 1 — a different PHP release is never silently substituted.
|
||||||
|
## The caller still asserts lsphpNN (the binary the extension was built for)
|
||||||
|
## equals WANT exactly and -common has the same upstream version and is >= WANT.
|
||||||
|
##
|
||||||
|
## LSPHP_MADISON_CMD (default "apt-cache madison") is overridable for tests.
|
||||||
|
|
||||||
|
lsphp_resolve_pin() {
|
||||||
|
local pkg="$1" want="$2" cmd="${LSPHP_MADISON_CMD:-apt-cache madison}"
|
||||||
|
local out v best="" up="${want%%-*}" suf=""
|
||||||
|
[[ "$want" == *+* ]] && suf="+${want#*+}"
|
||||||
|
out=$($cmd "$pkg") || { echo "lsphp-pin-resolve: '$cmd $pkg' failed" >&2; return 1; }
|
||||||
|
while read -r v; do
|
||||||
|
[ -n "$v" ] || continue
|
||||||
|
if [ "$v" = "$want" ]; then printf '%s\n' "$want"; return 0; fi
|
||||||
|
[ "${v%%-*}" = "$up" ] || continue
|
||||||
|
[ "$suf" = "" ] || [[ "$v" == *"$suf" ]] || continue
|
||||||
|
dpkg --compare-versions "$v" ge "$want" || continue
|
||||||
|
if [ -z "$best" ] || dpkg --compare-versions "$v" gt "$best"; then best="$v"; fi
|
||||||
|
done < <(awk -F'|' '{gsub(/ /,"",$2); print $2}' <<<"$out")
|
||||||
|
if [ -z "$best" ]; then
|
||||||
|
echo "lsphp-pin-resolve: $pkg offers no version of PHP $up compatible with $want" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
printf '%s\n' "$best"
|
||||||
|
}
|
||||||
|
|
||||||
|
## lsphp_pin_ok INSTALLED WANT — post-install assertion for the -common/-ldap
|
||||||
|
## packages: same upstream PHP version as WANT and not older than it.
|
||||||
|
lsphp_pin_ok() {
|
||||||
|
local inst="$1" want="$2"
|
||||||
|
[ "${inst%%-*}" = "${want%%-*}" ] && dpkg --compare-versions "$inst" ge "$want"
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ "${BASH_SOURCE[0]}" = "$0" ]; then
|
||||||
|
set -u
|
||||||
|
case "${1:-}" in
|
||||||
|
resolve) lsphp_resolve_pin "${2:?pkg}" "${3:?want}" ;;
|
||||||
|
ok) lsphp_pin_ok "${2:?installed}" "${3:?want}" ;;
|
||||||
|
*) echo "usage: $0 resolve PKG WANT | ok INSTALLED WANT" >&2; exit 2 ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
Executable
+19
@@ -0,0 +1,19 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## lsphp-repo-version.sh PHPVER [ARCH] — print the newest lsphpPHPVER package
|
||||||
|
## version in LiteSpeed's noble apt index for ARCH (amd64 | arm64; default
|
||||||
|
## $LSPHP_ARCH, else amd64, so callers that pass nothing behave as before).
|
||||||
|
## The awk/sort pipeline is byte-for-byte the one that used to be inlined in
|
||||||
|
## build-push.yaml and lsphp-source-emergency.yaml.
|
||||||
|
## Test hook: LSPHP_INDEX_FILE=<path> reads that Packages file instead of curl.
|
||||||
|
## Exit 1 (message on stderr) if the arch is unknown or the package is absent.
|
||||||
|
set -euo pipefail
|
||||||
|
phpver="${1:?usage: lsphp-repo-version.sh PHPVER [ARCH]}"
|
||||||
|
arch="${2:-${LSPHP_ARCH:-amd64}}"
|
||||||
|
case "$arch" in amd64|arm64) ;; *) echo "unsupported lsphp arch '$arch' (amd64|arm64)" >&2; exit 1 ;; esac
|
||||||
|
[[ "$phpver" =~ ^[0-9]+$ ]] || { echo "malformed PHPVER '$phpver'" >&2; exit 1; }
|
||||||
|
if [ -n "${LSPHP_INDEX_FILE:-}" ]; then
|
||||||
|
idx=$(cat "$LSPHP_INDEX_FILE")
|
||||||
|
else
|
||||||
|
idx=$(curl -fsS --proto '=https' --retry 3 --max-time 60 "https://rpms.litespeedtech.com/debian/dists/noble/main/binary-${arch}/Packages")
|
||||||
|
fi
|
||||||
|
printf '%s\n' "$idx" | awk -v p="lsphp${phpver}" '/^Package: /{n=$2} /^Version: / && n==p {print $2}' | sort -V | tail -n1
|
||||||
@@ -173,6 +173,21 @@ if [ -n "$PKG_SAVE_PATH" ]; then
|
|||||||
log "compiled-in session.save_path default set to '$PKG_SAVE_PATH' (as the packaged lsphp${PHPVER})"
|
log "compiled-in session.save_path default set to '$PKG_SAVE_PATH' (as the packaged lsphp${PHPVER})"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
## Measured 2026-11-19 (emergency from-source run 5683, all 4 versions): the
|
||||||
|
## packaged lsphp82-85 report session.upload_progress.enabled='1' under `php -n`;
|
||||||
|
## php.net's source default is "0" (the value sits on the line AFTER the name in
|
||||||
|
## ext/session/session.c). That was the ONLY difference the 4b gate listed. Follow
|
||||||
|
## the packaged binary; per-site php.ini hardening can still turn it off.
|
||||||
|
PKG_UP=$("$P/bin/php" -n -r 'echo ini_get("session.upload_progress.enabled");')
|
||||||
|
if [ "$PKG_UP" = "1" ]; then
|
||||||
|
sed -i -E '/STD_PHP_INI_BOOLEAN\("session\.upload_progress\.enabled",/{n;s/"0"/"1"/}' "$SRC/ext/session/session.c"
|
||||||
|
grep -A1 -F '"session.upload_progress.enabled"' "$SRC/ext/session/session.c" | grep -F '"1"' >/dev/null \
|
||||||
|
|| die "could not apply the packaged session.upload_progress.enabled default '1' to ext/session/session.c (source layout changed?)."
|
||||||
|
log "compiled-in session.upload_progress.enabled default set to '1' (as the packaged lsphp${PHPVER})"
|
||||||
|
elif [ "$PKG_UP" != "0" ]; then
|
||||||
|
die "unexpected packaged session.upload_progress.enabled default '$PKG_UP'."
|
||||||
|
fi
|
||||||
|
|
||||||
## ---- 3. replay the packaged configure line -----------------------------------
|
## ---- 3. replay the packaged configure line -----------------------------------
|
||||||
CFG_LINE=$("$P/bin/php" -i | awk -F' => ' '$1 == "Configure Command " || $1 == "Configure Command" {sub(/^[^=]*=> /, ""); print}')
|
CFG_LINE=$("$P/bin/php" -i | awk -F' => ' '$1 == "Configure Command " || $1 == "Configure Command" {sub(/^[^=]*=> /, ""); print}')
|
||||||
[ -n "$CFG_LINE" ] || die "could not read 'Configure Command' from the packaged $P/bin/php -i."
|
[ -n "$CFG_LINE" ] || die "could not read 'Configure Command' from the packaged $P/bin/php -i."
|
||||||
|
|||||||
Executable
+44
@@ -0,0 +1,44 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## php-emergency-guard.sh REF NEW_PHP
|
||||||
|
##
|
||||||
|
## "Do not roll back a newer php.net emergency image." REF is the published
|
||||||
|
## :phpNN tag a normal build is about to overwrite; NEW_PHP is the PHP version
|
||||||
|
## the normal build packages. Exit 0 = go ahead, 1 = refuse (or cannot tell).
|
||||||
|
##
|
||||||
|
## Decision (same predicate as the old inline step, evaluated on the amd64
|
||||||
|
## image only, so it is correct for a single-platform image AND a multi-arch
|
||||||
|
## index):
|
||||||
|
## REF does not exist yet (registry "not found") -> proceed (nothing to protect)
|
||||||
|
## labels read, source != php.net -> proceed
|
||||||
|
## labels read, source = php.net, cur == new -> proceed
|
||||||
|
## labels read, source = php.net, cur > new (sort -V) -> REFUSE
|
||||||
|
## labels read, source = php.net, cur < new -> proceed
|
||||||
|
## labels absent (older image without them) -> proceed (as before)
|
||||||
|
## ANYTHING ELSE (registry/auth/network error, malformed manifest, index
|
||||||
|
## without exactly one linux/amd64 image, non-amd64 config) -> REFUSE
|
||||||
|
## (FAIL CLOSED; the old step failed open and silently disabled the guard).
|
||||||
|
## Env: LABEL_SCRIPT (tests), IMAGETOOLS passed through.
|
||||||
|
set -euo pipefail
|
||||||
|
ref=${1:?usage: php-emergency-guard.sh REF NEW_PHP}
|
||||||
|
new=${2-}
|
||||||
|
here=$(cd "$(dirname "$0")" && pwd)
|
||||||
|
labeler=${LABEL_SCRIPT:-$here/image-label-amd64.sh}
|
||||||
|
|
||||||
|
rc=0
|
||||||
|
out=$("$labeler" "$ref" org.whp.lsphp-source org.whp.php-version) || rc=$?
|
||||||
|
if [ "$rc" -eq 3 ]; then
|
||||||
|
echo "published $ref: not found (first build); this build: packaged $new. Nothing to protect."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
if [ "$rc" -ne 0 ]; then
|
||||||
|
echo "::error::cannot read the php.net-emergency labels of the amd64 image behind $ref (rc=$rc). Refusing to overwrite it blind (fail closed). Retry the run; if it persists check registry access and the manifest."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
src=$(printf '%s\n' "$out" | sed -n 1p)
|
||||||
|
cur=$(printf '%s\n' "$out" | sed -n 2p)
|
||||||
|
echo "published $ref (amd64): source=${src:-?} php=${cur:-?}; this build: packaged $new"
|
||||||
|
if [ "$src" = "php.net" ] && [ "$cur" != "$new" ] && [ "$(printf '%s\n%s\n' "$cur" "$new" | sort -V | tail -n1)" = "$cur" ]; then
|
||||||
|
echo "::error::$ref is a php.net emergency build of PHP $cur; LiteSpeed still ships $new. Not overwriting it with an older PHP. Re-run lsphp-source-emergency.yaml for a newer fix, or wait for LiteSpeed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
+90
-17
@@ -4,11 +4,16 @@
|
|||||||
## when PKG_CACHE is set; without it the repo files are left alone and builds
|
## when PKG_CACHE is set; without it the repo files are left alone and builds
|
||||||
## use the upstream repositories as before.
|
## use the upstream repositories as before.
|
||||||
##
|
##
|
||||||
## PKG_CACHE=https://192.168.1.40 pkg-cache-repos.sh rpm # AlmaLinux/EPEL/Remi
|
## PKG_CACHE=https://192.168.1.40 pkg-cache-repos.sh rpm # AlmaLinux/EPEL/Remi/NodeSource
|
||||||
## PKG_CACHE=https://192.168.1.40 pkg-cache-repos.sh apt # Ubuntu + LiteSpeed
|
## PKG_CACHE=https://192.168.1.40 pkg-cache-repos.sh apt # Ubuntu, Debian, LiteSpeed
|
||||||
## pkg-cache-repos.sh release-install epel [remi] # GPG-verified release RPMs
|
## pkg-cache-repos.sh release-install epel [remi] # GPG-verified release RPMs (EL9/EL10)
|
||||||
|
## pkg-cache-repos.sh nodesource MAJOR # NodeSource repo file + pinned key
|
||||||
|
## eval "$(pkg-cache-repos.sh go-env)" # GOPROXY via the cache (go.sum/sumdb verified)
|
||||||
## pkg-cache-repos.sh restore # undo everything above
|
## pkg-cache-repos.sh restore # undo everything above
|
||||||
##
|
##
|
||||||
|
## CANONICAL copy: cloud-apache-container/scripts/pkg-cache-repos.sh (docs/pkg-cache.md
|
||||||
|
## there). Other repos carry byte-identical copies - change it there first.
|
||||||
|
##
|
||||||
## Every RUN that rewrites must `restore` before it ends: it puts rewritten files
|
## Every RUN that rewrites must `restore` before it ends: it puts rewritten files
|
||||||
## back, deletes files this script created, deletes any NEW repo/apt file that
|
## back, deletes files this script created, deletes any NEW repo/apt file that
|
||||||
## still references the cache, then FAILS if any reference is left — so no shipped
|
## still references the cache, then FAILS if any reference is left — so no shipped
|
||||||
@@ -43,7 +48,7 @@
|
|||||||
## cache (with the CA), and a build without PKG_CACHE uses upstream sources.
|
## cache (with the CA), and a build without PKG_CACHE uses upstream sources.
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
MODE="${1:?usage: pkg-cache-repos.sh rpm|apt|release-install NAME...|restore}"
|
MODE="${1:?usage: pkg-cache-repos.sh rpm|apt|release-install NAME...|nodesource MAJOR|go-env|restore}"
|
||||||
shift || true
|
shift || true
|
||||||
STATE=/var/lib/pkg-cache-repos # saved originals + manifest + created files
|
STATE=/var/lib/pkg-cache-repos # saved originals + manifest + created files
|
||||||
SHARE="${PKG_CACHE_SHARE:-/usr/local/share/pkg-cache}" # ca.crt + RPM-GPG-KEY-*
|
SHARE="${PKG_CACHE_SHARE:-/usr/local/share/pkg-cache}" # ca.crt + RPM-GPG-KEY-*
|
||||||
@@ -57,10 +62,22 @@ if [ -n "$C" ]; then
|
|||||||
https://*) ;;
|
https://*) ;;
|
||||||
*) die "PKG_CACHE must be an https:// URL (plain http is refused), got '$C'" ;;
|
*) die "PKG_CACHE must be an https:// URL (plain http is refused), got '$C'" ;;
|
||||||
esac
|
esac
|
||||||
|
[[ "$C" =~ ^https://[A-Za-z0-9.-]+(:[0-9]+)?(/[A-Za-z0-9._/-]*)?$ ]] || die "PKG_CACHE has unexpected characters: '$C'"
|
||||||
HOSTPORT="${C#https://}"; HOSTPORT="${HOSTPORT%%/*}"
|
HOSTPORT="${C#https://}"; HOSTPORT="${HOSTPORT%%/*}"
|
||||||
[ -s "$SHARE/ca.crt" ] || die "PKG_CACHE set but $SHARE/ca.crt (pkg-cache CA) is missing"
|
[ -s "$SHARE/ca.crt" ] || die "PKG_CACHE set but $SHARE/ca.crt (pkg-cache CA) is missing"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# System CA bundle (EL vs Debian/Ubuntu path); the pkg-cache CA is appended to a
|
||||||
|
# copy in the state dir, never to the system store.
|
||||||
|
sys_bundle() {
|
||||||
|
local b
|
||||||
|
for b in /etc/pki/tls/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt; do
|
||||||
|
[ -s "$b" ] && { echo "$b"; return 0; }
|
||||||
|
done
|
||||||
|
die "no system CA bundle found"
|
||||||
|
}
|
||||||
|
make_bundle() { cat "$(sys_bundle)" "$SHARE/ca.crt" > "$STATE/ca-bundle.pem"; }
|
||||||
|
|
||||||
# Files that may hold repo configuration; restore re-checks all of them.
|
# Files that may hold repo configuration; restore re-checks all of them.
|
||||||
repo_files() {
|
repo_files() {
|
||||||
find /etc/yum.repos.d /etc/dnf /etc/apt -type f 2>/dev/null | sort || true
|
find /etc/yum.repos.d /etc/dnf /etc/apt -type f 2>/dev/null | sort || true
|
||||||
@@ -83,13 +100,17 @@ created() { printf '%s\n' "$1" >> "$STATE/created"; }
|
|||||||
if [ "$MODE" = restore ]; then
|
if [ "$MODE" = restore ]; then
|
||||||
[ -d "$STATE" ] || exit 0
|
[ -d "$STATE" ] || exit 0
|
||||||
host=$(cat "$STATE/host")
|
host=$(cat "$STATE/host")
|
||||||
(cd "$STATE/orig" && find . -type f) | while read -r rel; do
|
# mapfile from a process substitution, not `cmd | while read`: no pipeline,
|
||||||
|
# so nothing for pipefail to misreport (scripts/tests/lsphp-info-probe.test.sh).
|
||||||
|
mapfile -t saved < <(cd "$STATE/orig" && find . -type f)
|
||||||
|
for rel in "${saved[@]}"; do
|
||||||
cat "$STATE/orig/$rel" > "/${rel#./}"
|
cat "$STATE/orig/$rel" > "/${rel#./}"
|
||||||
done
|
done
|
||||||
while read -r f; do [ -n "$f" ] && rm -f -- "$f"; done < "$STATE/created"
|
while read -r f; do [ -n "$f" ] && rm -f -- "$f"; done < "$STATE/created"
|
||||||
# A repo/apt file that appeared during this RUN and still names the cache
|
# A repo/apt file that appeared during this RUN and still names the cache
|
||||||
# (e.g. written by a package from the rewritten repos) is removed too.
|
# (e.g. written by a package from the rewritten repos) is removed too.
|
||||||
repo_files | while read -r f; do
|
mapfile -t current < <(repo_files)
|
||||||
|
for f in "${current[@]}"; do
|
||||||
if ! grep -qxF -- "$f" "$STATE/manifest" && grep -qF -- "$host" "$f"; then
|
if ! grep -qxF -- "$f" "$STATE/manifest" && grep -qF -- "$host" "$f"; then
|
||||||
echo "pkg-cache-repos: removing new file that references the cache: $f"
|
echo "pkg-cache-repos: removing new file that references the cache: $f"
|
||||||
rm -f -- "$f"
|
rm -f -- "$f"
|
||||||
@@ -108,18 +129,20 @@ if [ "$MODE" = release-install ]; then
|
|||||||
curl_opts=(-fsS --proto '=https' --retry 5 --retry-all-errors --max-time 120)
|
curl_opts=(-fsS --proto '=https' --retry 5 --retry-all-errors --max-time 120)
|
||||||
if [ -n "$C" ]; then
|
if [ -n "$C" ]; then
|
||||||
start_session
|
start_session
|
||||||
cat /etc/pki/tls/certs/ca-bundle.crt "$SHARE/ca.crt" > "$STATE/ca-bundle.pem"
|
make_bundle
|
||||||
curl_opts+=(--cacert "$STATE/ca-bundle.pem")
|
curl_opts+=(--cacert "$STATE/ca-bundle.pem")
|
||||||
fi
|
fi
|
||||||
files=()
|
files=()
|
||||||
|
el=$(rpm -E '%{?rhel}' 2>/dev/null || true)
|
||||||
|
case "$el" in 9|10) ;; *) die "release-install supports EL9/EL10 only (rpm -E %rhel = '$el')" ;; esac
|
||||||
for name in "$@"; do
|
for name in "$@"; do
|
||||||
case "$name" in
|
case "$name" in
|
||||||
epel) pkg=epel-release key=RPM-GPG-KEY-EPEL-10
|
epel) pkg=epel-release key=RPM-GPG-KEY-EPEL-$el
|
||||||
path=/epel/epel-release-latest-10.noarch.rpm
|
path=/epel/epel-release-latest-$el.noarch.rpm
|
||||||
origin=https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm ;;
|
origin=https://dl.fedoraproject.org/pub/epel/epel-release-latest-$el.noarch.rpm ;;
|
||||||
remi) pkg=remi-release key=RPM-GPG-KEY-remi2024
|
remi) pkg=remi-release key=RPM-GPG-KEY-remi2024
|
||||||
path=/remi/enterprise/remi-release-10.rpm
|
path=/remi/enterprise/remi-release-$el.rpm
|
||||||
origin=https://rpms.remirepo.net/enterprise/remi-release-10.rpm ;;
|
origin=https://rpms.remirepo.net/enterprise/remi-release-$el.rpm ;;
|
||||||
*) die "unknown release package '$name'" ;;
|
*) die "unknown release package '$name'" ;;
|
||||||
esac
|
esac
|
||||||
url="$origin"; [ -n "$C" ] && url="$C$path"
|
url="$origin"; [ -n "$C" ] && url="$C$path"
|
||||||
@@ -138,14 +161,14 @@ if [ "$MODE" = release-install ]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$C" ]; then
|
if [ -z "$C" ] && [ "$MODE" != nodesource ] && [ "$MODE" != go-env ]; then
|
||||||
echo "pkg-cache-repos($MODE): PKG_CACHE not set - using upstream repositories"
|
echo "pkg-cache-repos($MODE): PKG_CACHE not set - using upstream repositories"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rewrite_rpm() {
|
rewrite_rpm() {
|
||||||
local f="$1"
|
local f="$1"
|
||||||
grep -q -E '^#? ?baseurl=https?://(repo\.almalinux\.org|download\.example|rpms\.remirepo\.net)/' "$f" || return 0
|
grep -q -E '^#? ?baseurl=https?://(repo\.almalinux\.org|download\.example|rpms\.remirepo\.net|rpm\.nodesource\.com)/' "$f" || return 0
|
||||||
save "$f"
|
save "$f"
|
||||||
# Per [section]: a (commented or live) baseurl on a known origin becomes
|
# Per [section]: a (commented or live) baseurl on a known origin becomes
|
||||||
# "baseurl=<cache>/<prefix>/<path> <origin>/<path>"; that section's
|
# "baseurl=<cache>/<prefix>/<path> <origin>/<path>"; that section's
|
||||||
@@ -181,6 +204,8 @@ rewrite_rpm() {
|
|||||||
l = rw(l, "^#? ?baseurl=https?://repo\\.almalinux\\.org/almalinux/", "almalinux", "https://repo.almalinux.org/almalinux", 1)
|
l = rw(l, "^#? ?baseurl=https?://repo\\.almalinux\\.org/almalinux/", "almalinux", "https://repo.almalinux.org/almalinux", 1)
|
||||||
l = rw(l, "^#? ?baseurl=https?://download\\.example/pub/epel/", "epel", "https://dl.fedoraproject.org/pub/epel", 0)
|
l = rw(l, "^#? ?baseurl=https?://download\\.example/pub/epel/", "epel", "https://dl.fedoraproject.org/pub/epel", 0)
|
||||||
l = rw(l, "^#? ?baseurl=https?://rpms\\.remirepo\\.net/", "remi", "https://rpms.remirepo.net", 1)
|
l = rw(l, "^#? ?baseurl=https?://rpms\\.remirepo\\.net/", "remi", "https://rpms.remirepo.net", 1)
|
||||||
|
# NodeSource signs its RPMs but not repomd.xml (404): gpgcheck only.
|
||||||
|
l = rw(l, "^#? ?baseurl=https?://rpm\\.nodesource\\.com/", "nodesource", "https://rpm.nodesource.com", 0)
|
||||||
}
|
}
|
||||||
buf[++n] = l
|
buf[++n] = l
|
||||||
}
|
}
|
||||||
@@ -190,19 +215,65 @@ rewrite_rpm() {
|
|||||||
|
|
||||||
rewrite_apt() {
|
rewrite_apt() {
|
||||||
local f="$1"
|
local f="$1"
|
||||||
grep -q -E 'https?://([a-z]{2}\.)?(archive|security)\.ubuntu\.com/|https?://rpms\.litespeedtech\.com/' "$f" || return 0
|
grep -q -E 'https?://([a-z]{2}\.)?(archive|security)\.ubuntu\.com/|https?://rpms\.litespeedtech\.com/|https?://(deb|security)\.debian\.org/' "$f" || return 0
|
||||||
save "$f"
|
save "$f"
|
||||||
|
# Debian: debian-security first, and "debian" only as a whole path segment,
|
||||||
|
# so .../debian-security is never rewritten as /debian/.
|
||||||
sed -i -E \
|
sed -i -E \
|
||||||
-e "s%https?://(archive|[a-z]{2}\.archive)\.ubuntu\.com/ubuntu/?%$C/ubuntu/%g" \
|
-e "s%https?://(archive|[a-z]{2}\.archive)\.ubuntu\.com/ubuntu/?%$C/ubuntu/%g" \
|
||||||
-e "s%https?://security\.ubuntu\.com/ubuntu/?%$C/ubuntu-security/%g" \
|
-e "s%https?://security\.ubuntu\.com/ubuntu/?%$C/ubuntu-security/%g" \
|
||||||
-e "s%https?://rpms\.litespeedtech\.com/%$C/litespeed/%g" \
|
-e "s%https?://rpms\.litespeedtech\.com/%$C/litespeed/%g" \
|
||||||
|
-e "s%https?://(deb|security)\.debian\.org/debian-security/?([[:space:]]|\$)%$C/debian-security/\\2%g" \
|
||||||
|
-e "s%https?://security\.debian\.org/?([[:space:]]|\$)%$C/debian-security/\\1%g" \
|
||||||
|
-e "s%https?://deb\.debian\.org/debian/?([[:space:]]|\$)%$C/debian/\\1%g" \
|
||||||
"$f"
|
"$f"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if [ "$MODE" = go-env ]; then
|
||||||
|
# Prints shell exports for `eval`. Without PKG_CACHE: nothing (Go defaults).
|
||||||
|
# GOPROXY "a|b" falls through on ANY error, so a dead cache costs one
|
||||||
|
# failed request, not the build. GOSUMDB stays the default sum.golang.org,
|
||||||
|
# reached directly: modules are still verified against go.sum + the sumdb.
|
||||||
|
[ -n "$C" ] || { echo "pkg-cache-repos(go-env): PKG_CACHE not set - default GOPROXY" >&2; exit 0; }
|
||||||
|
start_session
|
||||||
|
make_bundle
|
||||||
|
printf "export GOPROXY='%s/goproxy|https://proxy.golang.org|direct' SSL_CERT_FILE='%s'\n" "$C" "$STATE/ca-bundle.pem"
|
||||||
|
echo "pkg-cache-repos(go-env): GOPROXY via $C/goproxy (fallback proxy.golang.org)" >&2
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$MODE" = nodesource ]; then
|
||||||
|
# Replaces `curl https://rpm.nodesource.com/setup_N.x | bash` (unverified
|
||||||
|
# remote script): writes the same nodesource-nodejs repo (origin URL, so the
|
||||||
|
# shipped image keeps a normal repo file) with gpgcheck=1 and the signing key
|
||||||
|
# committed in keys/pkg-cache/; with PKG_CACHE it is then rewritten like any
|
||||||
|
# other repo and `restore` puts the origin version back.
|
||||||
|
major="${1:?usage: pkg-cache-repos.sh nodesource MAJOR}"
|
||||||
|
[[ "$major" =~ ^[0-9]{1,3}$ ]] || die "bad Node major '$major'"
|
||||||
|
key="$SHARE/RPM-GPG-KEY-nodesource"
|
||||||
|
[ -s "$key" ] || die "missing $key"
|
||||||
|
rpm --import "$key" || die "cannot import $key"
|
||||||
|
rm -f /etc/yum.repos.d/nodesource*.repo
|
||||||
|
f=/etc/yum.repos.d/nodesource-nodejs.repo
|
||||||
|
printf '%s\n' "[nodesource-nodejs]" \
|
||||||
|
"name=Node.js Packages for Linux RPM based distros - \$basearch" \
|
||||||
|
"baseurl=https://rpm.nodesource.com/pub_${major}.x/nodistro/nodejs/\$basearch" \
|
||||||
|
"priority=9" "enabled=1" "gpgcheck=1" \
|
||||||
|
"gpgkey=file://$key" "module_hotfixes=1" > "$f"
|
||||||
|
echo "pkg-cache-repos: wrote $f (Node ${major}.x, key $(basename "$key"))"
|
||||||
|
if [ -n "$C" ]; then
|
||||||
|
start_session
|
||||||
|
make_bundle
|
||||||
|
rewrite_rpm "$f"
|
||||||
|
grep -h '^baseurl=' "$f" | sed 's/^/ /'
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
case "$MODE" in
|
case "$MODE" in
|
||||||
rpm)
|
rpm)
|
||||||
start_session
|
start_session
|
||||||
cat /etc/pki/tls/certs/ca-bundle.crt "$SHARE/ca.crt" > "$STATE/ca-bundle.pem"
|
make_bundle
|
||||||
for f in /etc/yum.repos.d/*.repo; do [ -f "$f" ] && rewrite_rpm "$f"; done
|
for f in /etc/yum.repos.d/*.repo; do [ -f "$f" ] && rewrite_rpm "$f"; done
|
||||||
echo "pkg-cache-repos(rpm): repos now via $C:"
|
echo "pkg-cache-repos(rpm): repos now via $C:"
|
||||||
grep -h '^baseurl=' /etc/yum.repos.d/*.repo | grep -F "$C/" | sort -u | sed 's/^/ /'
|
grep -h '^baseurl=' /etc/yum.repos.d/*.repo | grep -F "$C/" | sort -u | sed 's/^/ /'
|
||||||
@@ -217,7 +288,9 @@ case "$MODE" in
|
|||||||
[ -f "$f" ] && rewrite_apt "$f"
|
[ -f "$f" ] && rewrite_apt "$f"
|
||||||
done
|
done
|
||||||
echo "pkg-cache-repos(apt): sources now via $C:"
|
echo "pkg-cache-repos(apt): sources now via $C:"
|
||||||
grep -h -E '^(deb|URIs:)' /etc/apt/sources.list /etc/apt/sources.list.d/* 2>/dev/null | grep -F "$C/" | sort -u | sed 's/^/ /'
|
# (|| true: Debian 13 images have no /etc/apt/sources.list; grep's exit 2
|
||||||
|
# for the missing file must not fail the build under pipefail)
|
||||||
|
{ grep -h -E '^(deb|URIs:)' /etc/apt/sources.list /etc/apt/sources.list.d/* 2>/dev/null || true; } | grep -F "$C/" | sort -u | sed 's/^/ /' || true
|
||||||
;;
|
;;
|
||||||
*) die "unknown mode '$MODE'" ;;
|
*) die "unknown mode '$MODE'" ;;
|
||||||
esac
|
esac
|
||||||
Executable
+106
@@ -0,0 +1,106 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## image-label-amd64.test.sh — fixtures for scripts/image-label-amd64.sh and
|
||||||
|
## scripts/php-emergency-guard.sh, driven through a stub IMAGETOOLS.
|
||||||
|
## Proves: index-safe (two-platform OCI index WITH attestation children, Docker
|
||||||
|
## manifest list, single-platform manifest), fail-closed on malformed/ambiguous
|
||||||
|
## input, "not found" = proceed, and that for single-platform images the guard
|
||||||
|
## makes the SAME decision as the old inline step on every (src,cur,new) case.
|
||||||
|
set -euo pipefail
|
||||||
|
HERE=$(cd "$(dirname "$0")/.." && pwd)
|
||||||
|
T=$(mktemp -d); trap 'rm -rf "$T"' EXIT
|
||||||
|
mkdir -p "$T/raw" "$T/cfg" "$T/err"
|
||||||
|
fail=0
|
||||||
|
chk() { if [ "$2" = "$3" ]; then echo "ok $1"; else echo "FAIL $1: got '$2' want '$3'"; fail=1; fi; }
|
||||||
|
|
||||||
|
# ---- stub: inspect --raw REF / inspect REF --format ... ; fixtures keyed by ref
|
||||||
|
key() { printf '%s' "$1" | tr '/:@' '___'; }
|
||||||
|
cat >"$T/it" <<'STUB'
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
# args: inspect --raw REF | inspect REF --format F
|
||||||
|
d=$FIXDIR
|
||||||
|
[ "$1" = inspect ] || exit 2
|
||||||
|
if [ "$2" = --raw ]; then ref=$3; kind=raw; else ref=$2; kind=cfg; fi
|
||||||
|
k=$(printf '%s' "$ref" | tr '/:@' '___')
|
||||||
|
if [ -f "$d/err/$k" ]; then cat "$d/err/$k" >&2; exit 1; fi
|
||||||
|
[ -f "$d/$kind/$k" ] || { echo "ERROR: $ref: not found" >&2; exit 1; }
|
||||||
|
cat "$d/$kind/$k"
|
||||||
|
STUB
|
||||||
|
chmod +x "$T/it"
|
||||||
|
export FIXDIR=$T IMAGETOOLS="$T/it"
|
||||||
|
|
||||||
|
A=sha256:$(printf 'a%.0s' {1..64}); B=sha256:$(printf 'b%.0s' {1..64})
|
||||||
|
C=sha256:$(printf 'c%.0s' {1..64}); D=sha256:$(printf 'd%.0s' {1..64})
|
||||||
|
REPO=reg.example/org/img
|
||||||
|
put() { printf '%s' "$3" >"$T/$1/$(key "$2")"; }
|
||||||
|
cfg() { # arch src php -> image config json
|
||||||
|
printf '{"architecture":"%s","os":"linux","config":{"Labels":{"org.whp.lsphp-source":"%s","org.whp.php-version":"%s"}}}' "$1" "$2" "$3"; }
|
||||||
|
|
||||||
|
# 1. OCI index: amd64 + arm64 + two attestation children (unknown/unknown)
|
||||||
|
put raw $REPO:php85 '{"schemaVersion":2,"mediaType":"application/vnd.oci.image.index.v1+json","manifests":[
|
||||||
|
{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"'$A'","platform":{"architecture":"amd64","os":"linux"}},
|
||||||
|
{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"'$C'","platform":{"architecture":"unknown","os":"unknown"},"annotations":{"vnd.docker.reference.type":"attestation-manifest","vnd.docker.reference.digest":"'$A'"}},
|
||||||
|
{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"'$B'","platform":{"architecture":"arm64","os":"linux"}},
|
||||||
|
{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"'$D'","platform":{"architecture":"unknown","os":"unknown"},"annotations":{"vnd.docker.reference.type":"attestation-manifest","vnd.docker.reference.digest":"'$B'"}}]}'
|
||||||
|
put cfg $REPO@$A "$(cfg amd64 php.net 8.5.12)"
|
||||||
|
put cfg $REPO@$B "$(cfg arm64 php.net 8.5.99)" # must never be read
|
||||||
|
printf '%s\n%s\n' php.net 8.5.12 >"$T/want"
|
||||||
|
chk "index+attestations: amd64 labels" "$("$HERE/image-label-amd64.sh" $REPO:php85 org.whp.lsphp-source org.whp.php-version)" "$(cat "$T/want")"
|
||||||
|
|
||||||
|
# 2. Docker manifest list (no attestations)
|
||||||
|
put raw $REPO:ml '{"schemaVersion":2,"mediaType":"application/vnd.docker.distribution.manifest.list.v2+json","manifests":[
|
||||||
|
{"mediaType":"application/vnd.docker.distribution.manifest.v2+json","digest":"'$B'","platform":{"architecture":"arm64","os":"linux","variant":"v8"}},
|
||||||
|
{"mediaType":"application/vnd.docker.distribution.manifest.v2+json","digest":"'$A'","platform":{"architecture":"amd64","os":"linux"}}]}'
|
||||||
|
chk "docker manifest list" "$("$HERE/image-label-amd64.sh" $REPO:ml org.whp.php-version)" "8.5.12"
|
||||||
|
|
||||||
|
# 3. Single-platform manifest (today's amd64-only images); ref with digest too
|
||||||
|
put raw $REPO:single '{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"digest":"'$A'"},"layers":[]}'
|
||||||
|
put cfg $REPO:single "$(cfg amd64 litespeed 8.5.1)"
|
||||||
|
chk "single-platform manifest" "$("$HERE/image-label-amd64.sh" $REPO:single org.whp.lsphp-source org.whp.php-version | tr '\n' ,)" "litespeed,8.5.1,"
|
||||||
|
chk "absent label prints empty" "$("$HERE/image-label-amd64.sh" $REPO:single org.whp.nope)" ""
|
||||||
|
put raw $REPO:nolabels '{"mediaType":"x","config":{},"layers":[]}'
|
||||||
|
put cfg $REPO:nolabels '{"architecture":"amd64","config":{}}'
|
||||||
|
chk "config without Labels" "$("$HERE/image-label-amd64.sh" $REPO:nolabels org.whp.php-version)" ""
|
||||||
|
|
||||||
|
# 4. failures: each must exit non-zero (1) with nothing on stdout
|
||||||
|
bad() { # name ref
|
||||||
|
local out rc=0; out=$("$HERE/image-label-amd64.sh" "$2" org.whp.php-version 2>/dev/null) || rc=$?
|
||||||
|
chk "$1 -> rc $3" "$rc" "$3"; chk "$1 -> no stdout" "$out" ""
|
||||||
|
}
|
||||||
|
bad "tag not found" $REPO:nosuch 3
|
||||||
|
put raw $REPO:garbage 'this is not json'; bad "malformed JSON" $REPO:garbage 1
|
||||||
|
put raw $REPO:arr '[1,2]'; bad "JSON not an object" $REPO:arr 1
|
||||||
|
put raw $REPO:unk '{"foo":"bar"}'; bad "neither index nor manifest" $REPO:unk 1
|
||||||
|
put raw $REPO:armonly '{"manifests":[{"digest":"'$B'","platform":{"architecture":"arm64","os":"linux"}}]}'; bad "index without amd64" $REPO:armonly 1
|
||||||
|
put raw $REPO:two '{"manifests":[{"digest":"'$A'","platform":{"architecture":"amd64","os":"linux"}},{"digest":"'$D'","platform":{"architecture":"amd64","os":"linux"}}]}'; bad "ambiguous amd64" $REPO:two 1
|
||||||
|
put raw $REPO:baddig '{"manifests":[{"digest":"sha256:short","platform":{"architecture":"amd64","os":"linux"}}]}'; bad "malformed child digest" $REPO:baddig 1
|
||||||
|
put raw $REPO:badcfg '{"manifests":[{"digest":"'$D'","platform":{"architecture":"amd64","os":"linux"}}]}'
|
||||||
|
put cfg $REPO@$D 'not json'; bad "malformed config" $REPO:badcfg 1
|
||||||
|
put raw $REPO:wrongarch '{"manifests":[{"digest":"'$C'","platform":{"architecture":"amd64","os":"linux"}}]}'
|
||||||
|
put cfg $REPO@$C "$(cfg arm64 php.net 8.5.12)"; bad "amd64 slot with arm64 config" $REPO:wrongarch 1
|
||||||
|
printf 'ERROR: denied: requested access to the resource is denied\n' >"$T/err/$(key $REPO:denied)"; bad "auth/network error is NOT 'not found'" $REPO:denied 1
|
||||||
|
put raw $REPO:orphan '{"manifests":[{"digest":"'$B'","platform":{"architecture":"amd64","os":"linux"}}]}'; bad "child listed but missing" $REPO:orphan 1
|
||||||
|
|
||||||
|
# 5. Guard == old inline logic on single-platform fixtures, all combos
|
||||||
|
old() { # src cur new -> proceed|refuse (verbatim predicate of the old step)
|
||||||
|
local src=$1 cur=$2 new=$3
|
||||||
|
if [ "$src" = "php.net" ] && [ "$cur" != "$new" ] && [ "$(printf '%s\n%s\n' "$cur" "$new" | sort -V | tail -n1)" = "$cur" ]; then echo refuse; else echo proceed; fi; }
|
||||||
|
n=0
|
||||||
|
for src in php.net litespeed ""; do for cur in "" 8.5.11 8.5.12 8.5.13 8.4.99 8.10.0; do for new in 8.5.12 8.5.9 8.6.0; do
|
||||||
|
put raw $REPO:g '{"mediaType":"x","config":{},"layers":[]}'
|
||||||
|
put cfg $REPO:g "$(cfg amd64 "$src" "$cur")"
|
||||||
|
rc=0; "$HERE/php-emergency-guard.sh" $REPO:g "$new" >/dev/null 2>&1 || rc=$?
|
||||||
|
got=proceed; [ "$rc" -ne 0 ] && got=refuse
|
||||||
|
w=$(old "$src" "$cur" "$new"); n=$((n+1))
|
||||||
|
[ "$got" = "$w" ] || { echo "FAIL guard vs old: src='$src' cur='$cur' new='$new' got=$got old=$w"; fail=1; }
|
||||||
|
done; done; done
|
||||||
|
echo "ok guard == old inline logic on $n single-platform combos"
|
||||||
|
|
||||||
|
# 6. Guard on a multi-arch index: refuses the rollback (old logic could not even read it)
|
||||||
|
rc=0; "$HERE/php-emergency-guard.sh" $REPO:php85 8.5.9 >/dev/null 2>&1 || rc=$?; chk "index: emergency 8.5.12 vs packaged 8.5.9 refused" "$rc" 1
|
||||||
|
rc=0; "$HERE/php-emergency-guard.sh" $REPO:php85 8.6.0 >/dev/null 2>&1 || rc=$?; chk "index: packaged newer proceeds" "$rc" 0
|
||||||
|
# 7. fail closed vs first build
|
||||||
|
rc=0; "$HERE/php-emergency-guard.sh" $REPO:nosuch 8.5.9 >/dev/null 2>&1 || rc=$?; chk "tag absent: proceed (first build)" "$rc" 0
|
||||||
|
for t in garbage denied armonly orphan wrongarch; do
|
||||||
|
rc=0; "$HERE/php-emergency-guard.sh" $REPO:$t 8.5.9 >/dev/null 2>&1 || rc=$?; chk "unreadable ($t): FAIL CLOSED" "$rc" 1
|
||||||
|
done
|
||||||
|
[ "$fail" -eq 0 ] && echo "ALL PASS" || { echo "FAILURES"; exit 1; }
|
||||||
Executable
+54
@@ -0,0 +1,54 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## index-platforms.test.sh — scripts/index-platforms.sh and
|
||||||
|
## scripts/assemble-multiarch-index.sh (copy of haproxy-manager-base's) against a stub IMAGETOOLS.
|
||||||
|
set -euo pipefail
|
||||||
|
HERE=$(cd "$(dirname "$0")/.." && pwd)
|
||||||
|
T=$(mktemp -d); trap 'rm -rf "$T"' EXIT
|
||||||
|
fail=0
|
||||||
|
chk() { if [ "$2" = "$3" ]; then echo "ok $1"; else echo "FAIL $1: got '$2' want '$3'"; fail=1; fi; }
|
||||||
|
A=sha256:$(printf 'a%.0s' {1..64}); B=sha256:$(printf 'b%.0s' {1..64}); C=sha256:$(printf 'c%.0s' {1..64})
|
||||||
|
cat >"$T/it" <<'STUB'
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
# index-platforms mode: serves $FIX/<ref-with-/:@ as _> for "inspect --raw REF".
|
||||||
|
# assemble mode (STUB_LOG set): "inspect REF --format .." -> arch from $ARCHES (ref=arch lines);
|
||||||
|
# "create ..." -> appended to $STUB_LOG.
|
||||||
|
if [ -n "${STUB_LOG:-}" ]; then
|
||||||
|
if [ "$1" = create ]; then echo "create $*" >>"$STUB_LOG"; exit 0; fi
|
||||||
|
ref=$2; a=$(grep -F -m1 "$ref=" "$ARCHES" | cut -d= -f2); [ -n "$a" ] || exit 1
|
||||||
|
printf '{"architecture":"%s"}' "$a"; exit 0
|
||||||
|
fi
|
||||||
|
[ "$2" = --raw ] || exit 2
|
||||||
|
k=$(printf '%s' "$3" | tr '/:@' '___')
|
||||||
|
if [ -f "$FIX/err_$k" ]; then cat "$FIX/err_$k" >&2; exit 1; fi
|
||||||
|
[ -f "$FIX/$k" ] || { echo "ERROR: $3: not found" >&2; exit 1; }
|
||||||
|
cat "$FIX/$k"
|
||||||
|
STUB
|
||||||
|
chmod +x "$T/it"; export IMAGETOOLS="$T/it" FIX=$T
|
||||||
|
w() { printf '%s' "$2" >"$T/$(printf '%s' "$1" | tr '/:@' '___')"; }
|
||||||
|
w r/i:idx '{"mediaType":"application/vnd.oci.image.index.v1+json","manifests":[{"digest":"'$A'","platform":{"os":"linux","architecture":"amd64"}},{"digest":"'$B'","platform":{"os":"linux","architecture":"arm64"}},{"digest":"'$C'","platform":{"os":"unknown","architecture":"unknown"},"annotations":{"vnd.docker.reference.type":"attestation-manifest"}}]}'
|
||||||
|
w r/i:amd '{"manifests":[{"digest":"'$A'","platform":{"os":"linux","architecture":"amd64"}},{"digest":"'$C'","platform":{"os":"unknown","architecture":"unknown"},"annotations":{"vnd.docker.reference.type":"attestation-manifest"}}]}'
|
||||||
|
w r/i:one '{"config":{"digest":"'$A'"},"layers":[]}'
|
||||||
|
w r/i:bad 'garbage'
|
||||||
|
printf 'ERROR: denied\n' >"$T/err_r_i_den"
|
||||||
|
chk "two-platform index" "$("$HERE/index-platforms.sh" r/i:idx)" "index linux/amd64 linux/arm64"
|
||||||
|
chk "amd64 index with attestation" "$("$HERE/index-platforms.sh" r/i:amd)" "index linux/amd64"
|
||||||
|
chk "single manifest" "$("$HERE/index-platforms.sh" r/i:one)" "single"
|
||||||
|
for pair in "nosuch 3" "bad 1" "den 1"; do set -- $pair
|
||||||
|
rc=0; "$HERE/index-platforms.sh" r/i:$1 >/dev/null 2>&1 || rc=$?; chk "$1 -> rc $2" "$rc" "$2"; done
|
||||||
|
|
||||||
|
# ---- assemble-multiarch-index.sh (arm64 attach rules)
|
||||||
|
export STUB_LOG=$T/log ARCHES=$T/arches
|
||||||
|
R=reg/x
|
||||||
|
printf '%s\n' "$R@$A=amd64" "$R@$B=arm64" >"$ARCHES"
|
||||||
|
run() { : >"$STUB_LOG"; "$HERE/assemble-multiarch-index.sh" "$@" >/dev/null 2>&1; echo $?; }
|
||||||
|
chk "both ok -> rc 0" "$(run --amd64 $A --arm64 $B --arm64-outcome success --repo $R --tag t1 --tag t2)" 0
|
||||||
|
chk "both ok -> 1 create with 2 sources, 2 tags" "$(grep -c "create create -t $R:t1 -t $R:t2 $R@$A $R@$B\$" "$STUB_LOG")" 1
|
||||||
|
chk "arm64 failed (digest present, stale) -> amd64 only" "$(run --amd64 $A --arm64 $B --arm64-outcome failure --repo $R --tag t1)" 0
|
||||||
|
chk " ... create has no arm64 digest" "$(grep -c "$B" "$STUB_LOG" || true)" 0
|
||||||
|
run --amd64 $A --repo $R --tag t1 >/dev/null
|
||||||
|
chk "arm64 skipped -> amd64 only" "$(grep -c "$B" "$STUB_LOG" || true)" "0"
|
||||||
|
chk "malformed amd64 digest -> refuse" "$(run --amd64 nope --repo $R --tag t1)" 1
|
||||||
|
chk " ... nothing created" "$(grep -c create "$STUB_LOG" || true)" 0
|
||||||
|
printf '%s\n' "$R@$A=arm64" >"$ARCHES"
|
||||||
|
chk "amd64 digest that is not amd64 -> refuse" "$(run --amd64 $A --repo $R --tag t1)" 1
|
||||||
|
[ "$fail" -eq 0 ] && echo "ALL PASS" || { echo FAILURES; exit 1; }
|
||||||
Executable
+57
@@ -0,0 +1,57 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## lsphp-pin-resolve.test.sh — fixture test for scripts/lsphp-pin-resolve.sh.
|
||||||
|
## Fake `apt-cache madison` outputs model (a) a consistent repo (82/83/85: the
|
||||||
|
## pin must stay EXACTLY the lsphp version), (b) the 2026-11-19 lsphp84 set
|
||||||
|
## (lsphp84 -2, -common -3 only), (c) cases that must FAIL closed.
|
||||||
|
set -euo pipefail
|
||||||
|
HERE=$(cd "$(dirname "$0")/.." && pwd)
|
||||||
|
R="$HERE/lsphp-pin-resolve.sh"
|
||||||
|
T=$(mktemp -d); trap 'rm -rf "$T"' EXIT
|
||||||
|
fail=0
|
||||||
|
ok() { echo "ok - $1"; }
|
||||||
|
bad() { echo "FAIL - $1"; fail=1; }
|
||||||
|
mk() { # file, then lines "pkg|version"
|
||||||
|
local f="$1"; shift
|
||||||
|
: >"$f"
|
||||||
|
for l in "$@"; do printf '%s | %s | http://rpms.litespeedtech.com/debian noble/main amd64 Packages\n' "${l%%|*}" "${l#*|}" >>"$f"; done
|
||||||
|
}
|
||||||
|
cat >"$T/apt-cache" <<'EOS'
|
||||||
|
#!/bin/sh
|
||||||
|
[ "$1" = madison ] || exit 2
|
||||||
|
grep -E "^ *$2 \|" "$FIX" || true
|
||||||
|
EOS
|
||||||
|
chmod +x "$T/apt-cache"
|
||||||
|
export LSPHP_MADISON_CMD="$T/apt-cache madison"
|
||||||
|
|
||||||
|
res() { FIX="$1" "$R" resolve "$2" "$3" 2>/dev/null; }
|
||||||
|
expect() { # name want fixture pkg ver
|
||||||
|
local got; got=$(res "$3" "$4" "$5") || got=FAIL
|
||||||
|
[ "$got" = "$2" ] && ok "$1" || bad "$1 (got '$got', want '$2')"
|
||||||
|
}
|
||||||
|
|
||||||
|
mk "$T/consistent" "lsphp85-common|8.5.12-2+noble" "lsphp85-ldap|8.5.12-2+noble"
|
||||||
|
expect "consistent repo: -common stays exact" "8.5.12-2+noble" "$T/consistent" lsphp85-common 8.5.12-2+noble
|
||||||
|
expect "consistent repo: -ldap stays exact" "8.5.12-2+noble" "$T/consistent" lsphp85-ldap 8.5.12-2+noble
|
||||||
|
|
||||||
|
mk "$T/incons" "lsphp84-common|8.4.27-3+noble" "lsphp84-ldap|8.4.27-2+noble"
|
||||||
|
expect "inconsistent: -common resolves to -3" "8.4.27-3+noble" "$T/incons" lsphp84-common 8.4.27-2+noble
|
||||||
|
expect "inconsistent: -ldap stays -2" "8.4.27-2+noble" "$T/incons" lsphp84-ldap 8.4.27-2+noble
|
||||||
|
|
||||||
|
mk "$T/two" "lsphp84-common|8.4.27-3+noble" "lsphp84-common|8.4.27-2+noble"
|
||||||
|
expect "exact version preferred over newer revision" "8.4.27-2+noble" "$T/two" lsphp84-common 8.4.27-2+noble
|
||||||
|
|
||||||
|
mk "$T/otherphp" "lsphp84-common|8.4.28-1+noble"
|
||||||
|
expect "different PHP version is never substituted" FAIL "$T/otherphp" lsphp84-common 8.4.27-2+noble
|
||||||
|
mk "$T/older" "lsphp84-common|8.4.27-1+noble"
|
||||||
|
expect "older revision is never substituted" FAIL "$T/older" lsphp84-common 8.4.27-2+noble
|
||||||
|
mk "$T/otherdist" "lsphp84-common|8.4.27-3+jammy"
|
||||||
|
expect "different distro suffix is never substituted" FAIL "$T/otherdist" lsphp84-common 8.4.27-2+noble
|
||||||
|
: >"$T/empty"
|
||||||
|
expect "package absent fails" FAIL "$T/empty" lsphp84-common 8.4.27-2+noble
|
||||||
|
|
||||||
|
okc() { "$R" ok "$1" "$2" 2>/dev/null; }
|
||||||
|
okc 8.4.27-3+noble 8.4.27-2+noble && ok "post-check accepts -3 for want -2" || bad "post-check accepts -3"
|
||||||
|
okc 8.4.27-2+noble 8.4.27-2+noble && ok "post-check accepts equal" || bad "post-check equal"
|
||||||
|
okc 8.4.28-1+noble 8.4.27-2+noble && bad "post-check must reject other PHP version" || ok "post-check rejects other PHP version"
|
||||||
|
okc 8.4.27-1+noble 8.4.27-2+noble && bad "post-check must reject older" || ok "post-check rejects older"
|
||||||
|
exit $fail
|
||||||
Executable
+42
@@ -0,0 +1,42 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## lsphp-repo-version.test.sh — fixture test for scripts/lsphp-repo-version.sh.
|
||||||
|
## Asserts: amd64 (explicit and default) equals the OLD inline pipeline on the
|
||||||
|
## same fixture; arm64 picks from the arm64 index (fixtures deliberately differ);
|
||||||
|
## bad arch is refused.
|
||||||
|
set -euo pipefail
|
||||||
|
HERE=$(cd "$(dirname "$0")/.." && pwd)
|
||||||
|
S="$HERE/lsphp-repo-version.sh"
|
||||||
|
T=$(mktemp -d); trap 'rm -rf "$T"' EXIT
|
||||||
|
mk() { # file, version-for-lsphp85
|
||||||
|
cat >"$T/$1" <<EOT
|
||||||
|
Package: lsphp84
|
||||||
|
Version: 8.4.20-1+ubuntu24.04.1+deb.sury.org+1
|
||||||
|
Architecture: x
|
||||||
|
|
||||||
|
Package: lsphp85
|
||||||
|
Version: 8.5.1-1+ubuntu24.04.1+deb.sury.org+1
|
||||||
|
Architecture: x
|
||||||
|
|
||||||
|
Package: lsphp85
|
||||||
|
Version: $2
|
||||||
|
Architecture: x
|
||||||
|
|
||||||
|
Package: lsphp85-common
|
||||||
|
Version: 9.9.9-1
|
||||||
|
Architecture: x
|
||||||
|
EOT
|
||||||
|
}
|
||||||
|
mk amd64.Packages 8.5.12-1+ubuntu24.04.1+deb.sury.org+1
|
||||||
|
mk arm64.Packages 8.5.11-1+ubuntu24.04.1+deb.sury.org+1
|
||||||
|
old() { printf '%s\n' "$(cat "$1")" | awk -v p="lsphp${2}" '/^Package: /{n=$2} /^Version: / && n==p {print $2}' | sort -V | tail -n1; }
|
||||||
|
fail=0
|
||||||
|
chk() { if [ "$2" = "$3" ]; then echo "ok $1: $2"; else echo "FAIL $1: got '$2' want '$3'"; fail=1; fi; }
|
||||||
|
for v in 84 85; do
|
||||||
|
chk "amd64 explicit lsphp$v == old inline" "$(LSPHP_INDEX_FILE=$T/amd64.Packages "$S" $v amd64)" "$(old "$T/amd64.Packages" $v)"
|
||||||
|
chk "default arch lsphp$v == old inline" "$(LSPHP_INDEX_FILE=$T/amd64.Packages "$S" $v)" "$(old "$T/amd64.Packages" $v)"
|
||||||
|
done
|
||||||
|
chk "arm64 reads arm64 index" "$(LSPHP_INDEX_FILE=$T/arm64.Packages "$S" 85 arm64)" "8.5.11-1+ubuntu24.04.1+deb.sury.org+1"
|
||||||
|
chk "LSPHP_ARCH env" "$(LSPHP_ARCH=arm64 LSPHP_INDEX_FILE=$T/arm64.Packages "$S" 85)" "8.5.11-1+ubuntu24.04.1+deb.sury.org+1"
|
||||||
|
chk "missing pkg is empty" "$(LSPHP_INDEX_FILE=$T/amd64.Packages "$S" 99)" ""
|
||||||
|
if "$S" 85 s390x >/dev/null 2>&1; then echo "FAIL bad arch accepted"; fail=1; else echo "ok bad arch refused"; fi
|
||||||
|
exit $fail
|
||||||
+28
@@ -0,0 +1,28 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
## Fixture test: the step-2c upload_progress patch in lsphp-src-build.sh flips only
|
||||||
|
## session.upload_progress.enabled (value on the line after the name), is a no-op
|
||||||
|
## when already "1", and the script keeps its 4b gate + fails closed if not found.
|
||||||
|
set -euo pipefail
|
||||||
|
HERE=$(cd "$(dirname "$0")/.." && pwd)
|
||||||
|
S="$HERE/lsphp-src-build.sh"
|
||||||
|
T=$(mktemp -d); trap 'rm -rf "$T"' EXIT
|
||||||
|
fail=0
|
||||||
|
chk() { if [ "$2" = "$3" ]; then echo "ok $1"; else echo "FAIL $1: got '$2' want '$3'"; fail=1; fi; }
|
||||||
|
cat >"$T/session.c" <<'EOT'
|
||||||
|
STD_PHP_INI_BOOLEAN("session.upload_progress.enabled",
|
||||||
|
"0", ZEND_INI_PERDIR, OnUpdateBool, rfc1867_enabled, php_ps_globals, ps_globals)
|
||||||
|
STD_PHP_INI_BOOLEAN("session.upload_progress.cleanup",
|
||||||
|
"0", ZEND_INI_PERDIR, OnUpdateBool, rfc1867_cleanup, php_ps_globals, ps_globals)
|
||||||
|
EOT
|
||||||
|
## Run the exact sed expression from the script.
|
||||||
|
SEDLINE=$(grep -F "session\\.upload_progress\\.enabled" "$S" | grep '^ *sed -i' | head -n1)
|
||||||
|
[ -n "$SEDLINE" ] || { echo "FAIL: sed line not found in script"; exit 1; }
|
||||||
|
SRC="$T"; sed() { command sed "$@"; }
|
||||||
|
eval "${SEDLINE//\$SRC\/ext\/session\/session.c/$T/session.c}"
|
||||||
|
chk "enabled flipped to 1" "$(grep -A1 'upload_progress.enabled' "$T/session.c" | grep -c '"1"')" 1
|
||||||
|
chk "cleanup untouched" "$(grep -A1 'upload_progress.cleanup' "$T/session.c" | grep -c '"0"')" 1
|
||||||
|
eval "${SEDLINE//\$SRC\/ext\/session\/session.c/$T/session.c}"
|
||||||
|
chk "idempotent" "$(grep -A1 'upload_progress.enabled' "$T/session.c" | grep -c '"1"')" 1
|
||||||
|
grep -q 'ini defaults differ from the packaged' "$S" && echo "ok 4b gate still present" || { echo "FAIL 4b gate missing"; fail=1; }
|
||||||
|
grep -q 'could not apply the packaged session.upload_progress.enabled' "$S" && echo "ok fail-closed verify present" || { echo "FAIL verify missing"; fail=1; }
|
||||||
|
exit $fail
|
||||||
Executable
+310
@@ -0,0 +1,310 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Static wiring checks for the multi-arch publish jobs in .gitea/workflows/build-push.yaml
|
||||||
|
(Build-and-Push = cac, Build-FPM-Images = cac-fpm, Build-Shared-httpd = shared-httpd).
|
||||||
|
|
||||||
|
No YAML library (the Shell-Checks runner has none): jobs/steps are split on their indentation.
|
||||||
|
Env WORKFLOW overrides the file under test (used to show the tests fail on the old workflow).
|
||||||
|
Run: python3 -I scripts/tests/multiarch-workflow.test.py
|
||||||
|
"""
|
||||||
|
import os, re, subprocess, tempfile, unittest, stat
|
||||||
|
|
||||||
|
HERE = os.path.dirname(os.path.abspath(__file__))
|
||||||
|
ROOT = os.path.normpath(os.path.join(HERE, '..', '..'))
|
||||||
|
WF = os.environ.get('WORKFLOW') or os.path.join(ROOT, '.gitea', 'workflows', 'build-push.yaml')
|
||||||
|
with open(WF) as _f:
|
||||||
|
TEXT = _f.read()
|
||||||
|
REG = 'repo.anhonesthost.net/cloud-hosting-platform'
|
||||||
|
|
||||||
|
SLICE = { # job -> (image repo, dockerfile arg or None, matrix?)
|
||||||
|
'Build-and-Push': ('cac', None, True),
|
||||||
|
'Build-FPM-Images': ('cac-fpm', './Dockerfile.fpm', True),
|
||||||
|
'Build-Shared-httpd': ('shared-httpd', './Dockerfile.shared-httpd', False),
|
||||||
|
}
|
||||||
|
OUT_OF_SLICE = ['Build-LiteSpeed-Images', 'Build-LSPHP-Images', 'Build-Shared-OLS']
|
||||||
|
|
||||||
|
|
||||||
|
def jobs():
|
||||||
|
m = re.search(r'^jobs:\n', TEXT, re.M)
|
||||||
|
body = TEXT[m.end():]
|
||||||
|
parts = re.split(r'^ ([A-Za-z0-9_-]+):\n', body, flags=re.M)
|
||||||
|
return {parts[i]: parts[i + 1] for i in range(1, len(parts), 2)}
|
||||||
|
|
||||||
|
|
||||||
|
def steps(job):
|
||||||
|
s = re.split(r'^ - name: ', job, flags=re.M)[1:]
|
||||||
|
out = []
|
||||||
|
for blk in s:
|
||||||
|
name = blk.split('\n', 1)[0].strip()
|
||||||
|
out.append((name, blk))
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def step(job, prefix):
|
||||||
|
hits = [(n, b) for n, b in steps(job) if n.startswith(prefix)]
|
||||||
|
assert len(hits) == 1, (prefix, [n for n, _ in hits])
|
||||||
|
return hits[0][1]
|
||||||
|
|
||||||
|
|
||||||
|
class Wiring(unittest.TestCase):
|
||||||
|
@classmethod
|
||||||
|
def setUpClass(cls):
|
||||||
|
cls.jobs = jobs()
|
||||||
|
|
||||||
|
def test_triggers_unchanged(self):
|
||||||
|
head = TEXT.split('jobs:')[0]
|
||||||
|
self.assertRegex(head, r'on:\n push:\n branches:\n - trunk\n workflow_dispatch:')
|
||||||
|
|
||||||
|
def test_slice_jobs_exist_and_keep_matrix_and_no_fail_fast(self):
|
||||||
|
for j, (_, _, matrix) in SLICE.items():
|
||||||
|
self.assertIn(j, self.jobs, j)
|
||||||
|
if matrix:
|
||||||
|
self.assertIn('fail-fast: false', self.jobs[j], j)
|
||||||
|
self.assertRegex(self.jobs[j], r'phpver: \$\{\{ fromJSON\(needs\.plan\.outputs\.\w+\) \}\}', j)
|
||||||
|
|
||||||
|
def test_job_timeout_bounds_the_arm64_step(self):
|
||||||
|
for j in SLICE:
|
||||||
|
job = self.jobs[j]
|
||||||
|
jt = int(re.search(r'^ timeout-minutes: (\d+)$', job, re.M).group(1))
|
||||||
|
at = int(re.search(r'timeout-minutes: (\d+)', step(job, 'Build arm64')).group(1))
|
||||||
|
self.assertGreaterEqual(at, 20, j) # T3: arm64 under qemu took 7m47s
|
||||||
|
self.assertGreater(jt, at + 20, j) # room for setup + amd64 + assemble
|
||||||
|
self.assertLessEqual(jt, 120, j)
|
||||||
|
|
||||||
|
def test_step_order_and_ids(self):
|
||||||
|
for j in SLICE:
|
||||||
|
names = [n for n, _ in steps(self.jobs[j])]
|
||||||
|
a = [i for i, n in enumerate(names) if n.startswith('Build amd64')]
|
||||||
|
r = [i for i, n in enumerate(names) if n.startswith('Build arm64')]
|
||||||
|
s = [i for i, n in enumerate(names) if n.startswith('Assemble')]
|
||||||
|
self.assertEqual((len(a), len(r), len(s)), (1, 1, 1), j)
|
||||||
|
self.assertLess(a[0], r[0], j)
|
||||||
|
self.assertLess(r[0], s[0], j)
|
||||||
|
self.assertIn('id: amd64', step(self.jobs[j], 'Build amd64'))
|
||||||
|
self.assertIn('id: arm64', step(self.jobs[j], 'Build arm64'))
|
||||||
|
self.assertLess(names.index('Login to Gitea'), a[0], j)
|
||||||
|
|
||||||
|
def test_arm64_non_fatal_amd64_fatal(self):
|
||||||
|
for j in SLICE:
|
||||||
|
self.assertIn('continue-on-error: true', step(self.jobs[j], 'Build arm64'), j)
|
||||||
|
self.assertNotIn('continue-on-error', step(self.jobs[j], 'Build amd64'), j)
|
||||||
|
self.assertNotIn('continue-on-error', step(self.jobs[j], 'Assemble'), j)
|
||||||
|
|
||||||
|
def test_platforms_and_qemu(self):
|
||||||
|
for j in SLICE:
|
||||||
|
self.assertIn('platforms: linux/amd64\n', step(self.jobs[j], 'Build amd64'), j)
|
||||||
|
self.assertIn('platforms: linux/arm64\n', step(self.jobs[j], 'Build arm64'), j)
|
||||||
|
self.assertRegex(step(self.jobs[j], 'Set up QEMU'), r'platforms: arm64', j)
|
||||||
|
|
||||||
|
def test_both_push_by_digest_untagged_to_gitea_only(self):
|
||||||
|
for j, (repo, _, _) in SLICE.items():
|
||||||
|
for which in ('Build amd64', 'Build arm64'):
|
||||||
|
st = step(self.jobs[j], which)
|
||||||
|
self.assertIn('type=image,name=%s/%s,push-by-digest=true,name-canonical=true,push=true' % (REG, repo), st, j)
|
||||||
|
self.assertNotRegex(st, r'^\s+tags:', j)
|
||||||
|
self.assertNotRegex(st, r'^\s+push: true', j)
|
||||||
|
self.assertNotIn('ghcr.io', self.jobs[j], j) # CAC has never pushed to GHCR; do not widen
|
||||||
|
|
||||||
|
def test_same_build_args_and_dockerfile_for_both_platforms(self):
|
||||||
|
for j, (_, dockerfile, _) in SLICE.items():
|
||||||
|
a = step(self.jobs[j], 'Build amd64'); r = step(self.jobs[j], 'Build arm64')
|
||||||
|
ba = lambda s: re.search(r'build-args: \|\n((?: .*\n)+)', s).group(1)
|
||||||
|
self.assertEqual(ba(a), ba(r), j)
|
||||||
|
for need in (('PKG_CACHE=${{ steps.pkgcache.outputs.url }}', 'BASE_IMAGE=${{ steps.base.outputs.image }}')):
|
||||||
|
for n in need:
|
||||||
|
self.assertIn(n, ba(a), j)
|
||||||
|
if SLICE[j][2]:
|
||||||
|
for n in ('PHPVER=${{ matrix.phpver }}', 'CACHE_BUST=${{ steps.bust.outputs.value }}',
|
||||||
|
'EXPECT_PHP_MIN=${{ steps.phpmin.outputs.min }}'):
|
||||||
|
self.assertIn(n, ba(a), j)
|
||||||
|
if dockerfile:
|
||||||
|
self.assertIn('file: %s\n' % dockerfile, a, j)
|
||||||
|
self.assertIn('file: %s\n' % dockerfile, r, j)
|
||||||
|
|
||||||
|
def test_assemble_uses_this_runs_outputs_and_repo(self):
|
||||||
|
for j, (repo, _, _) in SLICE.items():
|
||||||
|
st = step(self.jobs[j], 'Assemble')
|
||||||
|
self.assertIn('${{ steps.amd64.outputs.digest }}', st, j)
|
||||||
|
self.assertIn('${{ steps.arm64.outputs.digest }}', st, j)
|
||||||
|
self.assertIn('${{ steps.arm64.outcome }}', st, j)
|
||||||
|
self.assertIn('scripts/assemble-multiarch-index.sh', st, j)
|
||||||
|
self.assertIn('--repo %s/%s' % (REG, repo), st, j)
|
||||||
|
self.assertEqual(st.count('--repo '), 1, j)
|
||||||
|
|
||||||
|
def test_tag_scheme_unchanged(self):
|
||||||
|
"""Run the assemble step's shell with a recording stub: exact tags per version."""
|
||||||
|
for j, (repo, _, matrix) in SLICE.items():
|
||||||
|
st = step(self.jobs[j], 'Assemble')
|
||||||
|
script = re.search(r'run: \|\n((?: .*\n?)+)', st).group(1)
|
||||||
|
script = '\n'.join(l[10:] for l in script.split('\n'))
|
||||||
|
for ver in (['82', '83', '84', '85'] if matrix else ['']):
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
os.makedirs(os.path.join(d, 'scripts'))
|
||||||
|
stub = os.path.join(d, 'scripts', 'assemble-multiarch-index.sh')
|
||||||
|
with open(stub, 'w') as f:
|
||||||
|
f.write('#!/usr/bin/env bash\nprintf "%s\\n" "$@" > "$LOG"\n')
|
||||||
|
os.chmod(stub, 0o755)
|
||||||
|
log = os.path.join(d, 'log')
|
||||||
|
env = dict(os.environ, LOG=log, AMD64_DIGEST='sha256:' + 'a' * 64,
|
||||||
|
ARM64_DIGEST='sha256:' + 'b' * 64, ARM64_OUTCOME='success', PHPVER=ver)
|
||||||
|
subprocess.run(['bash', '-c', script], cwd=d, env=env, check=True)
|
||||||
|
with open(log) as f:
|
||||||
|
args = f.read().split('\n')[:-1]
|
||||||
|
tags = [args[i + 1] for i, x in enumerate(args) if x == '--tag']
|
||||||
|
want = ['latest'] if not matrix else (['php' + ver] + (['latest'] if ver == '85' else []))
|
||||||
|
self.assertEqual(tags, want, (j, ver))
|
||||||
|
self.assertEqual(args[args.index('--repo') + 1], '%s/%s' % (REG, repo))
|
||||||
|
self.assertEqual(args[args.index('--arm64-outcome') + 1], 'success')
|
||||||
|
|
||||||
|
def test_arm64_never_added_outside_the_first_slice(self):
|
||||||
|
for j in OUT_OF_SLICE:
|
||||||
|
self.assertIn(j, self.jobs, j)
|
||||||
|
job = self.jobs[j]
|
||||||
|
self.assertIn('platforms: linux/amd64', job, j)
|
||||||
|
self.assertNotIn('linux/arm64', job, j)
|
||||||
|
self.assertNotIn('push-by-digest', job, j)
|
||||||
|
self.assertNotIn('assemble-multiarch-index', job, j)
|
||||||
|
|
||||||
|
def test_only_the_assemble_script_creates_tags_in_slice(self):
|
||||||
|
for j in SLICE:
|
||||||
|
self.assertNotIn('imagetools create', self.jobs[j], j) # only via the tested script
|
||||||
|
|
||||||
|
|
||||||
|
# ---- single-leg dispatch (workflow_dispatch input `only`, plan job) ----------------------
|
||||||
|
PLAN = os.path.join(ROOT, '.gitea', 'scripts', 'plan-legs.sh')
|
||||||
|
FULL = '[82,83,84,85]'
|
||||||
|
# image job -> (plan output, matrix?)
|
||||||
|
LEGS = {
|
||||||
|
'Build-and-Push': ('cac', True),
|
||||||
|
'Build-FPM-Images': ('cac_fpm', True),
|
||||||
|
'Build-LiteSpeed-Images': ('cac_litespeed', True),
|
||||||
|
'Build-LSPHP-Images': ('cac_lsphp', True),
|
||||||
|
'Build-Shared-httpd': ('shared_httpd', False),
|
||||||
|
'Build-Shared-OLS': ('shared_ols', False),
|
||||||
|
}
|
||||||
|
EMPTY = {'cac': '[]', 'cac_fpm': '[]', 'cac_litespeed': '[]', 'cac_lsphp': '[]',
|
||||||
|
'shared_httpd': 'false', 'shared_ols': 'false'}
|
||||||
|
EVERYTHING = {'cac': FULL, 'cac_fpm': FULL, 'cac_litespeed': FULL, 'cac_lsphp': FULL,
|
||||||
|
'shared_httpd': 'true', 'shared_ols': 'true'}
|
||||||
|
|
||||||
|
|
||||||
|
def plan(only):
|
||||||
|
"""Run plan-legs.sh like the runner does. Returns (exit code, outputs dict, stderr)."""
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
out = os.path.join(d, 'out')
|
||||||
|
open(out, 'w').close()
|
||||||
|
env = dict(os.environ, GITHUB_OUTPUT=out)
|
||||||
|
if only is None:
|
||||||
|
env.pop('ONLY', None) # push event: the input does not exist
|
||||||
|
else:
|
||||||
|
env['ONLY'] = only
|
||||||
|
r = subprocess.run(['bash', PLAN], env=env, capture_output=True, text=True, timeout=30)
|
||||||
|
with open(out) as f:
|
||||||
|
kv = dict(l.rstrip('\n').split('=', 1) for l in f if '=' in l)
|
||||||
|
return r.returncode, kv, r.stderr
|
||||||
|
|
||||||
|
|
||||||
|
class SingleLegDispatch(unittest.TestCase):
|
||||||
|
@classmethod
|
||||||
|
def setUpClass(cls):
|
||||||
|
cls.jobs = jobs()
|
||||||
|
|
||||||
|
def test_trigger_still_trunk_push_only_and_dispatch_has_string_input(self):
|
||||||
|
head = TEXT.split('jobs:')[0]
|
||||||
|
self.assertEqual(re.findall(r'^ branches:\n((?: - .*\n)+)', head, re.M), [' - trunk\n'])
|
||||||
|
m = re.search(r'^ workflow_dispatch:\n inputs:\n only:\n((?: .*\n)+)', head, re.M)
|
||||||
|
self.assertIsNotNone(m, 'workflow_dispatch needs an `only` input')
|
||||||
|
self.assertIn("default: ''", m.group(1))
|
||||||
|
self.assertIn('required: false', m.group(1))
|
||||||
|
self.assertIn('type: string', m.group(1))
|
||||||
|
|
||||||
|
def test_plan_job_wiring(self):
|
||||||
|
plan_job = self.jobs['plan']
|
||||||
|
# input goes through env, never interpolated into the shell script
|
||||||
|
self.assertRegex(plan_job, r'env:\n ONLY: \$\{\{ github\.event\.inputs\.only \}\}')
|
||||||
|
run = re.search(r'run: (.*)\n', step(plan_job, 'Plan legs')).group(1)
|
||||||
|
self.assertNotIn('${{', run)
|
||||||
|
self.assertIn('.gitea/scripts/plan-legs.sh', run)
|
||||||
|
for _, (out, _) in LEGS.items():
|
||||||
|
self.assertIn(' %s: ${{ steps.plan.outputs.%s }}' % (out, out), plan_job, out)
|
||||||
|
self.assertIn('id: plan', step(plan_job, 'Plan legs'))
|
||||||
|
|
||||||
|
def test_every_image_job_depends_on_plan_with_its_own_output(self):
|
||||||
|
for j, (out, matrix) in LEGS.items():
|
||||||
|
job = self.jobs[j]
|
||||||
|
self.assertRegex(job, r'(?m)^ needs: plan$', j)
|
||||||
|
want = ("if: needs.plan.outputs.%s != '[]'" if matrix else "if: needs.plan.outputs.%s == 'true'") % out
|
||||||
|
self.assertRegex(job, r'(?m)^ ' + re.escape(want) + r'$', j)
|
||||||
|
if matrix:
|
||||||
|
self.assertIn('phpver: ${{ fromJSON(needs.plan.outputs.%s) }}' % out, job, j)
|
||||||
|
self.assertNotRegex(job, r'if:.*matrix\.', j) # job-level if cannot see matrix
|
||||||
|
self.assertNotRegex(job, r'phpver: \[', j) # no literal list left behind
|
||||||
|
outs = [o for o, _ in LEGS.values()]
|
||||||
|
self.assertEqual(len(outs), len(set(outs)))
|
||||||
|
|
||||||
|
def test_every_job_but_shell_checks_and_plan_is_gated(self):
|
||||||
|
for j in self.jobs:
|
||||||
|
if j in ('Shell-Checks', 'plan'):
|
||||||
|
continue
|
||||||
|
self.assertIn(j, LEGS, 'new job %s must be gated by the plan job' % j)
|
||||||
|
sc = self.jobs['Shell-Checks']
|
||||||
|
self.assertNotRegex(sc, r'^ (needs|if):', 'Shell-Checks must stay ungated')
|
||||||
|
self.assertIn('.gitea/scripts/plan-legs.sh', sc) # shellchecked
|
||||||
|
self.assertIn('multiarch-workflow.test.py', sc) # this suite still runs
|
||||||
|
|
||||||
|
def test_plan_outputs_match_what_the_script_emits(self):
|
||||||
|
rc, kv, _ = plan('')
|
||||||
|
self.assertEqual(rc, 0)
|
||||||
|
self.assertEqual(sorted(kv), sorted(o for o, _ in LEGS.values()))
|
||||||
|
|
||||||
|
def test_push_and_empty_input_plan_everything(self):
|
||||||
|
for only in (None, '', ' ', '\t'):
|
||||||
|
rc, kv, err = plan(only)
|
||||||
|
self.assertEqual((rc, kv), (0, EVERYTHING), (only, err))
|
||||||
|
|
||||||
|
def test_full_matrix_equals_the_old_literal(self):
|
||||||
|
# the pre-change matrix was `phpver: [82, 83, 84, 85]`
|
||||||
|
rc, kv, _ = plan(None)
|
||||||
|
self.assertEqual([int(x) for x in kv['cac'].strip('[]').split(',')], [82, 83, 84, 85])
|
||||||
|
|
||||||
|
def test_single_leg(self):
|
||||||
|
rc, kv, _ = plan('cac:php85')
|
||||||
|
self.assertEqual((rc, kv), (0, dict(EMPTY, cac='[85]')))
|
||||||
|
rc, kv, _ = plan('cac-fpm:php84')
|
||||||
|
self.assertEqual((rc, kv), (0, dict(EMPTY, cac_fpm='[84]')))
|
||||||
|
rc, kv, _ = plan('cac-litespeed:php82')
|
||||||
|
self.assertEqual((rc, kv), (0, dict(EMPTY, cac_litespeed='[82]')))
|
||||||
|
rc, kv, _ = plan('cac-lsphp:php83')
|
||||||
|
self.assertEqual((rc, kv), (0, dict(EMPTY, cac_lsphp='[83]')))
|
||||||
|
rc, kv, _ = plan('shared-httpd')
|
||||||
|
self.assertEqual((rc, kv), (0, dict(EMPTY, shared_httpd='true')))
|
||||||
|
rc, kv, _ = plan('shared-ols')
|
||||||
|
self.assertEqual((rc, kv), (0, dict(EMPTY, shared_ols='true')))
|
||||||
|
|
||||||
|
def test_cac_does_not_pull_in_cac_fpm(self):
|
||||||
|
rc, kv, _ = plan('cac:php85')
|
||||||
|
self.assertEqual(kv['cac_fpm'], '[]')
|
||||||
|
self.assertEqual(kv['cac_litespeed'], '[]')
|
||||||
|
|
||||||
|
def test_family_name_means_every_version(self):
|
||||||
|
rc, kv, _ = plan('cac-fpm')
|
||||||
|
self.assertEqual((rc, kv), (0, dict(EMPTY, cac_fpm=FULL)))
|
||||||
|
|
||||||
|
def test_comma_list_spaces_duplicates_and_ordering(self):
|
||||||
|
rc, kv, _ = plan(' cac:php85 , cac:php82,cac:php85, shared-httpd ,')
|
||||||
|
self.assertEqual((rc, kv), (0, dict(EMPTY, cac='[82,85]', shared_httpd='true')))
|
||||||
|
rc, kv, _ = plan('cac:php85,cac-fpm:php84')
|
||||||
|
self.assertEqual((rc, kv), (0, dict(EMPTY, cac='[85]', cac_fpm='[84]')))
|
||||||
|
|
||||||
|
def test_unknown_values_fail_loudly_and_emit_nothing(self):
|
||||||
|
bad = ['foo', 'cac:php99', 'cac:85', 'cac:php8', 'CAC:php85', 'cac:', 'cac:php85:x', 'php85',
|
||||||
|
'shared-httpd:php85', 'shared-ols:latest', ',', ' , ', 'cac:php85,nope',
|
||||||
|
'cac:php85;rm -rf x', '$(id)', 'all', 'latest']
|
||||||
|
for only in bad:
|
||||||
|
rc, kv, err = plan(only)
|
||||||
|
self.assertEqual(rc, 2, only)
|
||||||
|
self.assertEqual(kv, {}, only) # nothing half-planned
|
||||||
|
self.assertIn('plan-legs:', err, only)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main(verbosity=2)
|
||||||
Reference in new issue
Block a user