From d99618079b7ce3a30b55a2ffede32404ea1d2de6 Mon Sep 17 00:00:00 2001 From: wanghe-fit2cloud Date: Tue, 17 Nov 2026 11:32:44 +0800 Subject: [PATCH] feat: add database replication images and shared checks --- .../workflows/database-cluster-release.yml | 157 ++++++++++++ README.md | 70 +++++- README_zh.md | 70 +++++- checks/README.md | 99 ++++++++ {tests => checks}/check-java-runtime.sh | 0 checks/check-mysql-cluster.sh | 154 ++++++++++++ {tests => checks}/check-php-eol-backport.py | 0 .../check-php-legacy-backport.py | 0 {tests => checks}/check-php-legacy-runtime.py | 0 {tests => checks}/check-php-pecl-source.py | 2 +- {tests => checks}/check-php-pecl.sh | 2 +- checks/check-postgresql-cluster.sh | 238 ++++++++++++++++++ checks/check-redis-cluster.sh | 153 +++++++++++ database-ha/README.md | 70 ++++++ database-ha/mysql/Dockerfile | 35 +++ database-ha/mysql/README.md | 74 ++++++ database-ha/mysql/docker-entrypoint.sh | 178 +++++++++++++ database-ha/mysql/healthcheck.sh | 10 + database-ha/mysql/my.cnf | 12 + database-ha/postgresql/Dockerfile | 22 ++ database-ha/postgresql/README.md | 66 +++++ database-ha/postgresql/entrypoint.sh | 151 +++++++++++ database-ha/postgresql/healthcheck.sh | 4 + database-ha/redis/Dockerfile | 27 ++ database-ha/redis/README.md | 63 +++++ database-ha/redis/docker-entrypoint.sh | 63 +++++ database-ha/versions.json | 16 ++ php/EOL-BACKPORT.md | 8 +- 28 files changed, 1712 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/database-cluster-release.yml create mode 100644 checks/README.md rename {tests => checks}/check-java-runtime.sh (100%) create mode 100644 checks/check-mysql-cluster.sh rename {tests => checks}/check-php-eol-backport.py (100%) rename {tests => checks}/check-php-legacy-backport.py (100%) rename {tests => checks}/check-php-legacy-runtime.py (100%) rename {tests => checks}/check-php-pecl-source.py (96%) rename {tests => checks}/check-php-pecl.sh (82%) create mode 100644 checks/check-postgresql-cluster.sh create mode 100644 checks/check-redis-cluster.sh create mode 100644 database-ha/README.md create mode 100644 database-ha/mysql/Dockerfile create mode 100644 database-ha/mysql/README.md create mode 100644 database-ha/mysql/docker-entrypoint.sh create mode 100644 database-ha/mysql/healthcheck.sh create mode 100644 database-ha/mysql/my.cnf create mode 100644 database-ha/postgresql/Dockerfile create mode 100644 database-ha/postgresql/README.md create mode 100644 database-ha/postgresql/entrypoint.sh create mode 100644 database-ha/postgresql/healthcheck.sh create mode 100644 database-ha/redis/Dockerfile create mode 100644 database-ha/redis/README.md create mode 100644 database-ha/redis/docker-entrypoint.sh create mode 100644 database-ha/versions.json diff --git a/.github/workflows/database-cluster-release.yml b/.github/workflows/database-cluster-release.yml new file mode 100644 index 0000000..552401b --- /dev/null +++ b/.github/workflows/database-cluster-release.yml @@ -0,0 +1,157 @@ +name: Build Database Replication Images + +on: + pull_request: + paths: + - 'database-ha/**' + - 'checks/check-*-cluster.sh' + - '.github/workflows/database-cluster-release.yml' + workflow_dispatch: + inputs: + database: + description: 'Database' + type: choice + options: [all, mysql, postgresql, redis] + default: all + version: + description: 'Supported series (e.g. 8.4, 18, 6.2); all builds every supported series' + default: all + publish: + description: 'Publish to Docker Hub after both architectures pass' + type: boolean + default: false + +permissions: + contents: read + +concurrency: + group: database-cluster-${{ github.event_name == 'workflow_dispatch' && inputs.publish && 'publish' || github.run_id }} + cancel-in-progress: false + +jobs: + prepare: + runs-on: ubuntu-24.04 + outputs: + matrix: ${{ steps.matrix.outputs.matrix }} + images: ${{ steps.matrix.outputs.images }} + steps: + - uses: actions/checkout@v5 + + - name: Prepare supported versions + id: matrix + env: + DATABASE: ${{ inputs.database || 'all' }} + VERSION: ${{ inputs.version || 'all' }} + run: | + python3 - <<'PY' >> "$GITHUB_OUTPUT" + import json + import os + import re + from pathlib import Path + + selected = os.environ['DATABASE'] + series_filter = os.environ['VERSION'] + versions = json.loads(Path('database-ha/versions.json').read_text()) + arguments = {'mysql': 'MYSQL_VERSION', 'postgresql': 'POSTGRESQL_VERSION', 'redis': 'REDIS_VERSION'} + if selected != 'all' and selected not in versions: + raise SystemExit('Unsupported database') + if selected == 'all' and series_filter != 'all': + raise SystemExit('Select a database when selecting one version series') + builds, images = [], [] + for name, supported in versions.items(): + if name not in arguments: + raise SystemExit(f'Unsupported database in versions.json: {name}') + if selected not in ('all', name): + continue + if series_filter != 'all' and series_filter not in supported: + raise SystemExit(f'Unsupported {name} series: {series_filter}') + for series, version in supported.items(): + if not re.fullmatch(r'[0-9]+(?:\.[0-9]+)*', series) or not re.fullmatch(re.escape(series) + r'\.[0-9]+', version): + raise SystemExit(f'Invalid {name} version mapping: {series} -> {version}') + if series_filter not in ('all', series): + continue + build_args = f'{arguments[name]}={version}' + if name == 'redis': + variant = 'trixie' if series == '8.10' else 'bookworm' + build_args += f'\nREDIS_VARIANT={variant}' + image = f'1panel/{name}-cluster:{series}' + images.append({'image': image}) + for architecture, runner in [('amd64', 'ubuntu-24.04'), ('arm64', 'ubuntu-24.04-arm')]: + builds.append({ + 'database': name, + 'build_args': build_args, + 'version': version, + 'series': series, + 'architecture': architecture, + 'runner': runner, + 'image': f'{image}-{architecture}', + }) + print('matrix=' + json.dumps({'include': builds})) + print('images=' + json.dumps({'include': images})) + PY + + build: + needs: prepare + strategy: + fail-fast: false + matrix: ${{ fromJSON(needs.prepare.outputs.matrix) }} + runs-on: ${{ matrix.runner }} + timeout-minutes: 30 + steps: + - uses: actions/checkout@v5 + + - uses: docker/setup-buildx-action@v3 + + - name: Build native image + uses: docker/build-push-action@v6 + with: + context: database-ha/${{ matrix.database }} + platforms: linux/${{ matrix.architecture }} + load: true + pull: true + build-args: ${{ matrix.build_args }} + tags: ${{ matrix.image }} + labels: | + org.opencontainers.image.source=https://github.com/1Panel-dev/runtime + org.opencontainers.image.revision=${{ github.sha }} + org.opencontainers.image.version=${{ matrix.version }} + cache-from: type=gha,scope=${{ matrix.database }}-${{ matrix.series }}-${{ matrix.architecture }} + cache-to: type=gha,scope=${{ matrix.database }}-${{ matrix.series }}-${{ matrix.architecture }},mode=max + + - name: Check replication and persistence + env: + DATABASE: ${{ matrix.database }} + IMAGE: ${{ matrix.image }} + run: bash "checks/check-${DATABASE}-cluster.sh" "$IMAGE" + + - name: Login to Docker Hub + if: github.event_name == 'workflow_dispatch' && inputs.publish + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Push verified architecture + if: github.event_name == 'workflow_dispatch' && inputs.publish + env: + IMAGE: ${{ matrix.image }} + run: docker push "$IMAGE" + + publish: + if: github.event_name == 'workflow_dispatch' && inputs.publish + needs: [prepare, build] + strategy: + matrix: ${{ fromJSON(needs.prepare.outputs.images) }} + runs-on: ubuntu-24.04 + steps: + - uses: docker/setup-buildx-action@v3 + + - uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Publish multi-platform manifest + env: + IMAGE: ${{ matrix.image }} + run: docker buildx imagetools create --tag "$IMAGE" "${IMAGE}-amd64" "${IMAGE}-arm64" diff --git a/README.md b/README.md index e0729d7..8e85eb7 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,17 @@ [English](README.md) | [中文](README_zh.md) -# 1Panel Runtime Images +# 1Panel Container Images -This repository contains runtime images used by 1Panel. +This repository builds and publishes container images used by 1Panel, covering AI agents, language runtimes, model inference and high availability databases. -Current images in this repository: +## Image categories -- `1panel/comfyui` -- `1panel/deepseek-harness` -- `1panel/hermes-agent` -- `1panel/openclaw` -- `1panel/vllm` -- `1panel/node` -- `1panel/php` -- `1panel/java` +| Category | Images | +| --- | --- | +| AI agents | `1panel/deepseek-harness`, `1panel/hermes-agent`, `1panel/openclaw` | +| Language runtimes | `1panel/node`, `1panel/php`, `1panel/java` | +| Model inference and generation | `1panel/vllm`, `1panel/comfyui` | +| Database replication | `1panel/mysql-cluster`, `1panel/postgresql-cluster`, `1panel/redis-cluster` | ## Images @@ -25,6 +23,52 @@ Current images in this repository: - `1panel/node`: Node.js runtime image - `1panel/php`: PHP-FPM runtime images for multiple versions - `1panel/java`: Java JDK runtime images based on Eclipse Temurin +- `1panel/mysql-cluster`: MySQL primary/replica image with 1Panel installation package compatibility +- `1panel/postgresql-cluster`: PostgreSQL streaming replication image with 1Panel installation package compatibility +- `1panel/redis-cluster`: Redis primary/replica image with 1Panel installation package compatibility + +## Repository layout + +| Path | Purpose | +| --- | --- | +| `deepseek-harness/`, `hermes-agent/`, `openclaw/` | Agent image sources and startup configuration | +| `node/`, `php/`, `java/` | Language runtime images and version-specific build files | +| `vllm-gb10-dual-node/`, `comfyui/` | Model inference and generation images and deployment adaptations | +| [database-ha/](database-ha/README.md) | Database replication image sources and supported version mappings | +| [checks/](checks/README.md) | Source, configuration, patch and container runtime checks | +| `.github/workflows/`, `.cnb.yml`, `.cnb/` | Build, validation, publication and repository synchronization workflows | + +## Database replication images + +Database image sources and supported version mappings are grouped under [database-ha/](database-ha/README.md). Their runtime checks are maintained in the shared [checks/](checks/README.md) directory. + +| Image | Supported series / image tags | +| --- | --- | +| `1panel/mysql-cluster` | `8.4` | +| `1panel/postgresql-cluster` | `15`, `16`, `17`, `18` | +| `1panel/redis-cluster` | `6.2`, `7.4`, `8.10` | + +Tags follow the existing 1Panel HA package version rules: MySQL and Redis use major.minor; PostgreSQL uses the major version. The exact upstream patch versions are pinned in [versions.json](database-ha/versions.json). Primary and replica nodes use the same image with different replication environment variables. + +`Build Database Replication Images` builds and checks each selected series on native amd64 and arm64 runners. Select a database and series, or use `all` to build every supported entry. Manual runs default to build and test only; enabling `publish` pushes the verified architecture images and publishes the series manifest after all selected builds pass. + +The supported list includes the existing 1Panel HA series still maintained upstream and adds PostgreSQL 18 and Redis 8.10. MySQL 5.7/8.0 and PostgreSQL 13/14 have reached EOL; Redis 8.0 is marked unsupported in the upstream security policy. See [support decisions and upstream sources](database-ha/README.md#版本维护范围). + +These images provide primary/replica replication. Existing cluster migration, cross-major database upgrades and automatic failover require separate procedures and validation. + +## Image checks + +[checks/](checks/README.md) provides a shared validation entry point for maintainers and CI. Its nine scripts comprise four offline checks and five container checks: + +| Check type | Scope | +| --- | --- | +| Source and configuration | Dockerfiles, entrypoints, version constraints, image tags and release workflow consistency | +| Source patches | Checksums, patch application and rejection of repeated application or tampered inputs | +| Container behavior | PHP extensions and CLI/FPM behavior, database client connections, backup and restore, replication and restart persistence | + +The database build workflow runs the corresponding container check after building each version and architecture. The Java and PHP scripts in this directory currently run manually. Image builds and publication are controlled by the workflows; checks run independently of application startup. + +Run the relevant offline checks before building, then validate the built image for each affected version and architecture before publication. A successful check covers the cases actually executed; `SKIP` identifies cases that were not verified. The directory guide lists commands, dependencies and validation boundaries. ## PHP 8 security releases @@ -34,7 +78,7 @@ Current images in this repository: The PHP 5.6, PHP 7 and PHP 8 images install checksum-pinned PEAR 1.10.18 after compiling PHP. The separate 5.6/7.0–7.2 contexts first upgrade checksum-pinned Archive_Tar 1.4.14 to satisfy its dependency. PHP 5.6 uses the system CA bundle through `SSL_CERT_FILE`, with certificate verification enabled. This includes the upstream [HTTP chunked response fix](https://github.com/pear/pear-core/pull/152), which prevents PECL metadata from failing with `does not have REST info xml available`. The bootstrap uses curl and a local, offline upgrade because the older PEAR downloader cannot fetch the update reliably. -Run `bash tests/check-php-pecl.sh IMAGE` against a built image to download, compile and load APCu in a disposable container and verify a cache write/read. It selects APCu 4.0.11 for PHP 5.6 and needs network access. Run `python3 tests/check-php-pecl-source.py` for offline checks of all seven build contexts and the release wiring. +Run `bash checks/check-php-pecl.sh IMAGE` against a built image to download, compile and load APCu in a disposable container and verify a cache write/read. It selects APCu 4.0.11 for PHP 5.6 and needs network access. Run `python3 checks/check-php-pecl-source.py` for offline checks of all seven build contexts and the release wiring. ## Rebuilding PHP images @@ -53,7 +97,7 @@ For PHP 8.2+, rebuild only images whose PEAR is older than 1.10.17. `Build PHP 8 ## PHP EOL source backports -PHP 5.6.40, 7.0.33, 7.1.33, 7.2.34 and 7.3.33 builds also apply SHA256-pinned local source backports, including the alternate `php/5.6` context. The third-party starting patches have been supplemented with applicable allocation-overflow, VM and request-state changes from PHP's minimal backport. The maintenance image tags are `5.6.41-fpm`, `7.0.34-fpm`, `7.1.34-fpm`, `7.2.35-fpm` and `7.3.34-fpm`; internal PHP versions retain the real baselines above. Use `tests/check-php-legacy-backport.py` for source checks and `tests/check-php-legacy-runtime.py IMAGE` for actual CLI/FPM regressions. These branches remain EOL; provenance, behavior changes and validation instructions are documented below. +PHP 5.6.40, 7.0.33, 7.1.33, 7.2.34 and 7.3.33 builds also apply SHA256-pinned local source backports, including the alternate `php/5.6` context. The third-party starting patches have been supplemented with applicable allocation-overflow, VM and request-state changes from PHP's minimal backport. The maintenance image tags are `5.6.41-fpm`, `7.0.34-fpm`, `7.1.34-fpm`, `7.2.35-fpm` and `7.3.34-fpm`; internal PHP versions retain the real baselines above. Use `checks/check-php-legacy-backport.py` for source checks and `checks/check-php-legacy-runtime.py IMAGE` for actual CLI/FPM regressions. These branches remain EOL; provenance, behavior changes and validation instructions are documented below. PHP 7.4.33, 8.0.30 and 8.1.34 builds apply the official minimal source backports for CVE-2026-109618 / CVE-2026-109619 and rebuild PHP. These branches remain EOL; older patch levels in these series now fail explicitly. `1panel/php:7.4.34-fpm`, `8.0.31-fpm` and `8.1.35-fpm` are 1Panel maintenance image tags based on official PHP 7.4.33, 8.0.30 and 8.1.34 respectively; their internal PHP versions remain unchanged. See [implementation, compatibility changes and validation](php/EOL-BACKPORT.md). diff --git a/README_zh.md b/README_zh.md index d74e27c..eba483f 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,19 +1,17 @@ [English](README.md) | [中文](README_zh.md) -# 1Panel Runtime Images +# 1Panel Container Images -本仓库用于构建和发布 1Panel 使用的运行时镜像。 +本仓库用于构建和发布 1Panel 使用的容器镜像,涵盖智能体、编程语言运行环境、模型推理和高可用数据库。 -当前仓库主要维护以下镜像: +## 镜像分类 -- `1panel/comfyui` -- `1panel/deepseek-harness` -- `1panel/hermes-agent` -- `1panel/openclaw` -- `1panel/vllm` -- `1panel/node` -- `1panel/php` -- `1panel/java` +| 分类 | 镜像 | +| --- | --- | +| 智能体 | `1panel/deepseek-harness`、`1panel/hermes-agent`、`1panel/openclaw` | +| 编程语言运行环境 | `1panel/node`、`1panel/php`、`1panel/java` | +| 模型推理与生成 | `1panel/vllm`、`1panel/comfyui` | +| 数据库主从复制 | `1panel/mysql-cluster`、`1panel/postgresql-cluster`、`1panel/redis-cluster` | ## 镜像说明 @@ -25,6 +23,52 @@ - `1panel/node`:Node.js 运行环境镜像 - `1panel/php`:多个版本的 PHP-FPM 运行环境镜像 - `1panel/java`:基于 Eclipse Temurin 的 Java JDK 运行环境镜像 +- `1panel/mysql-cluster`:兼容 1Panel 安装包接口的 MySQL 主从复制镜像 +- `1panel/postgresql-cluster`:兼容 1Panel 安装包接口的 PostgreSQL 流复制镜像 +- `1panel/redis-cluster`:兼容 1Panel 安装包接口的 Redis 主从复制镜像 + +## 仓库结构 + +| 路径 | 职责 | +| --- | --- | +| `deepseek-harness/`、`hermes-agent/`、`openclaw/` | 智能体镜像源码与启动配置 | +| `node/`、`php/`、`java/` | 编程语言运行环境镜像与各版本构建文件 | +| `vllm-gb10-dual-node/`、`comfyui/` | 模型推理、生成镜像及部署适配 | +| [database-ha/](database-ha/README.md) | 数据库主从镜像源码与支持版本映射 | +| [checks/](checks/README.md) | 源码、配置、补丁和容器运行校验 | +| `.github/workflows/`、`.cnb.yml`、`.cnb/` | 构建、校验、镜像发布与仓库同步工作流 | + +## 数据库主从镜像 + +三类数据库的源码和版本映射放在 [database-ha/](database-ha/README.md),运行校验脚本统一维护在根目录的 [checks/](checks/README.md)。 + +| 镜像 | 支持系列与镜像标签 | +| --- | --- | +| `1panel/mysql-cluster` | `8.4` | +| `1panel/postgresql-cluster` | `15`、`16`、`17`、`18` | +| `1panel/redis-cluster` | `6.2`、`7.4`、`8.10` | + +版本规则沿用当前 1Panel 高可用安装包:MySQL、Redis 使用主次版本号,PostgreSQL 使用主版本号。实际构建使用的补丁版本固定在 [versions.json](database-ha/versions.json)。主从节点使用同一个镜像,通过复制环境变量区分角色。 + +`Build Database Replication Images` 在原生 amd64、arm64 Runner 上构建并验证所选系列。可以选择数据库和系列,也可以使用 `all` 构建全部支持项。手动运行默认只构建测试;启用 `publish` 后推送已验证的架构镜像,并在全部选中任务通过后发布系列标签的多架构 manifest。 + +支持范围覆盖当前 1Panel 高可用仍有上游维护的系列,并新增 PostgreSQL 18、Redis 8.10。MySQL 5.7/8.0、PostgreSQL 13/14 已结束维护;Redis 8.0 已被上游安全政策列为不支持,详见[版本维护范围及官方来源](database-ha/README.md#版本维护范围)。 + +这些镜像提供主从复制。已有集群迁移、数据库跨主版本升级及自动故障切换需要独立的实施与验证流程。 + +## 镜像校验 + +[checks/](checks/README.md) 是维护者和 CI 的统一校验入口,目前包含 9 个脚本:4 个离线检查和 5 个容器检查。 + +| 校验类型 | 覆盖内容 | +| --- | --- | +| 源码与配置 | Dockerfile、入口、版本限制、镜像标签与发布工作流的一致性 | +| 源码补丁 | 校验值、补丁应用,以及重复应用或输入被篡改时的拒绝行为 | +| 容器行为 | PHP 扩展与 CLI/FPM 行为、数据库客户端连接、备份恢复、主从复制和重启持久化 | + +数据库构建工作流会在构建每个版本和架构的镜像后,执行对应的容器校验。本目录的 Java、PHP 脚本目前由维护者手动执行。镜像构建与发布由工作流控制,校验脚本独立于应用启动流程运行。 + +维护时先运行相关离线检查,再构建镜像,并在发布前校验受影响的版本和架构。检查通过仅覆盖实际执行的场景,`SKIP` 表示该项尚未验证。各脚本的命令、依赖与验证边界详见目录说明。 ## PHP 8 安全版本 @@ -34,7 +78,7 @@ PHP 5.6、PHP 7 和 PHP 8 镜像在编译 PHP 后安装固定版本、校验 SHA256 的 PEAR 1.10.18。独立的 5.6/7.0–7.2 构建目录先离线升级固定版本并校验 SHA256 的 Archive_Tar 1.4.14,以满足其依赖。PHP 5.6 通过 `SSL_CERT_FILE` 使用系统 CA 证书包,保留证书校验。其中包含上游的 [HTTP 分块响应修复](https://github.com/pear/pear-core/pull/152),避免 PECL 元数据解析报 `does not have REST info xml available`。通过 curl 下载后离线升级,避免旧版 PEAR 下载器无法下载自身更新。 -构建镜像后运行 `bash tests/check-php-pecl.sh IMAGE`,在临时容器中下载、编译、加载 APCu 并检查缓存读写。PHP 5.6 自动选择 APCu 4.0.11,此检查需要联网。运行 `python3 tests/check-php-pecl-source.py` 可离线检查全部七个构建目录及发布入口。 +构建镜像后运行 `bash checks/check-php-pecl.sh IMAGE`,在临时容器中下载、编译、加载 APCu 并检查缓存读写。PHP 5.6 自动选择 APCu 4.0.11,此检查需要联网。运行 `python3 checks/check-php-pecl-source.py` 可离线检查全部七个构建目录及发布入口。 ## 重新发布 PHP 镜像 @@ -53,7 +97,7 @@ PHP 8.2+ 仅在镜像内 PEAR 低于 1.10.17 时需要为本问题重打。`Buil ## PHP EOL 源码回补 -PHP 5.6.40、7.0.33、7.1.33、7.2.34 和 7.3.33 的构建也会应用固定 SHA256 的本地源码回补。补丁以第三方回补为起点,并补齐官方最小回补中适用于各旧分支的分配溢出、VM 和请求状态清理等改动;备用 `php/5.6` 入口同样覆盖。维护版镜像标签分别为 `5.6.41-fpm`、`7.0.34-fpm`、`7.1.34-fpm`、`7.2.35-fpm`、`7.3.34-fpm`,内部 PHP 版本仍保留上述真实基线。源码校验使用 `tests/check-php-legacy-backport.py`,实际 CLI/FPM 回归使用 `tests/check-php-legacy-runtime.py IMAGE`。这些旧分支仍为 EOL,详细来源、行为变化和验证方式见下方说明。 +PHP 5.6.40、7.0.33、7.1.33、7.2.34 和 7.3.33 的构建也会应用固定 SHA256 的本地源码回补。补丁以第三方回补为起点,并补齐官方最小回补中适用于各旧分支的分配溢出、VM 和请求状态清理等改动;备用 `php/5.6` 入口同样覆盖。维护版镜像标签分别为 `5.6.41-fpm`、`7.0.34-fpm`、`7.1.34-fpm`、`7.2.35-fpm`、`7.3.34-fpm`,内部 PHP 版本仍保留上述真实基线。源码校验使用 `checks/check-php-legacy-backport.py`,实际 CLI/FPM 回归使用 `checks/check-php-legacy-runtime.py IMAGE`。这些旧分支仍为 EOL,详细来源、行为变化和验证方式见下方说明。 PHP 7.4.33、8.0.30 和 8.1.34 构建会应用官方针对 CVE-2026-109618 / CVE-2026-109619 的最小源码回补并重新编译 PHP。这些分支仍为 EOL,同系列更早的补丁版本现在会明确失败。`1panel/php:7.4.34-fpm`、`8.0.31-fpm` 和 `8.1.35-fpm` 为 1Panel 维护版镜像标签,分别基于官方 PHP 7.4.33、8.0.30、8.1.34 加上述回补,内部 PHP 版本保持原值。详见[实现、兼容性变化和验证说明](php/EOL-BACKPORT.md)。 diff --git a/checks/README.md b/checks/README.md new file mode 100644 index 0000000..2c0efa6 --- /dev/null +++ b/checks/README.md @@ -0,0 +1,99 @@ +# 镜像校验 + +`checks/` 是镜像维护者的统一校验目录,用于在修改 Dockerfile、入口脚本、源码补丁、版本或发布配置后,确认相关约定和运行行为仍然符合预期。目前覆盖 Java、PHP,以及 MySQL、PostgreSQL、Redis 主从镜像。 + +## 在仓库中的职责 + +| 位置 | 负责内容 | +| --- | --- | +| 各镜像目录 | 保存 Dockerfile、入口脚本及运行配置,实现镜像的构建和启动 | +| `checks/` | 提供可独立执行的校验脚本,验证源码、构建配置和已构建镜像的行为 | +| `.github/workflows/`、`.cnb.yml` | 编排构建和发布任务;已接入校验的任务在相应步骤调用检查脚本 | + +校验脚本由维护者或 CI 执行,不参与 1Panel 用户的应用启动流程。脚本本身不构建或推送镜像;容器运行校验使用传入的镜像创建临时环境。 + +## 校验的三个层次 + +| 类型 | 主要确认什么 | 执行条件 | +| --- | --- | --- | +| 源码与配置检查 | Dockerfile、入口、版本限制、镜像标签和发布工作流是否保持一致 | 仓库源码、Shell 或 Python,无需 Docker | +| 源码补丁验证 | 源码包和补丁校验值是否正确、补丁能否应用、重复应用或输入被篡改时是否拒绝 | 本地源码包、补丁、Python 和 patch,无需 Docker | +| 容器运行回归 | 客户端能否连接、扩展能否工作、主从能否同步、重启后数据与权限是否正确 | Docker 和目标版本、目标架构的已构建镜像 | + +## 脚本用途 + +| 脚本 | 校验内容 | 运行要求 | +| --- | --- | --- | +| [check-java-runtime.sh](check-java-runtime.sh) | Java Dockerfile、入口、发布工作流及文档的静态一致性 | Bash、仓库源码 | +| [check-php-pecl-source.py](check-php-pecl-source.py) | PHP PECL 初始化、Shell 语法及发布入口 | Python 3、Shell、仓库源码 | +| [check-php-eol-backport.py](check-php-eol-backport.py) | PHP 回补脚本、版本限制、工作流构建上下文与镜像标签 | Python 3、Shell;可传入源码及补丁目录追加校验 | +| [check-php-legacy-backport.py](check-php-legacy-backport.py) | 旧 PHP 源码包校验、补丁应用与构建失败处理 | Python 3、Shell、patch;可传入 PHP 7.3.33 源码包 | +| [check-php-pecl.sh](check-php-pecl.sh) | 容器内下载、编译、加载 APCu 并验证缓存读写 | Bash、Docker、已构建的 PHP 镜像、网络 | +| [check-php-legacy-runtime.py](check-php-legacy-runtime.py) | PHP CLI、FastCGI、OOM 恢复、扩展及上传行为 | Python 3、Docker、已构建的 PHP 镜像 | +| [check-mysql-cluster.sh](check-mysql-cluster.sh) | MySQL 默认客户端、备份恢复、全量与增量复制、只读及重启恢复 | Bash、Docker、已构建的 MySQL 主从镜像 | +| [check-postgresql-cluster.sh](check-postgresql-cluster.sh) | PostgreSQL 流复制、历史认证规则保留、配置、目录权限及数据版本保护 | Bash、Docker、已构建的 PostgreSQL 主从镜像 | +| [check-redis-cluster.sh](check-redis-cluster.sh) | Redis 主从复制、复制延迟等待、配置优先级、密码及 RDB/AOF 恢复 | Bash、Docker、已构建的 Redis 主从镜像 | + +## 何时执行 + +| 修改内容 | 对应检查 | +| --- | --- | +| Java Dockerfile、入口或发布配置 | `check-java-runtime.sh` | +| PHP PEAR/PECL 初始化或扩展安装配置 | 先运行 `check-php-pecl-source.py`,构建后运行 `check-php-pecl.sh` | +| PHP 源码补丁、回补脚本、版本限制或维护标签 | 按版本范围运行两个 backport 源码检查,构建后运行 `check-php-legacy-runtime.py` | +| 数据库基础版本、初始化、认证、复制或持久化逻辑 | 构建受影响的版本和架构,运行对应的 `check-*-cluster.sh` | + +## 执行方式 + +每个脚本独立执行,按修改范围选择。以下命令均在仓库根目录运行。 + +源码与构建配置检查默认离线执行: + +```bash +bash checks/check-java-runtime.sh +python3 checks/check-php-pecl-source.py +python3 checks/check-php-eol-backport.py +python3 checks/check-php-legacy-backport.py +``` + +追加完整源码验证时,传入对应的本地输入: + +```bash +python3 checks/check-php-legacy-backport.py /path/to/php-7.3.33.tar.xz +python3 checks/check-php-eol-backport.py /path/to/source-inputs +``` + +第二条命令所需的源码包、补丁文件名和版本范围见 [PHP 回补说明](../php/EOL-BACKPORT.md)。不传额外输入时,部分源码检查会跳过,具体范围以脚本输出为准。 + +容器运行校验在构建对应镜像后执行: + +```bash +bash checks/check-php-pecl.sh PHP_IMAGE +python3 checks/check-php-legacy-runtime.py PHP_IMAGE +bash checks/check-mysql-cluster.sh 1panel/mysql-cluster:8.4 +bash checks/check-postgresql-cluster.sh 1panel/postgresql-cluster:18 +bash checks/check-redis-cluster.sh 1panel/redis-cluster:8.10 +``` + +将 `PHP_IMAGE` 替换为待验证的 PHP 镜像名称。数据库镜像构建方法与支持版本见 [database-ha](../database-ha/README.md)。 + +数据库校验使用唯一名称创建临时容器、网络和数据卷,结束时清理本次创建的资源。PHP 运行校验同样使用临时容器;PECL 校验会在容器中联网下载和编译扩展。 + +## 与 CI 和发布的关系 + +三个数据库校验脚本已接入 [Build Database Replication Images](../.github/workflows/database-cluster-release.yml): + +- 涉及数据库源码或数据库校验脚本的 PR,会触发对应工作流,从版本清单生成 amd64、arm64 构建及运行校验任务。 +- 每个任务先构建镜像,再调用对应的 `check-*-cluster.sh`;该项校验失败会阻止该项镜像推送。 +- PR 只构建和校验。手动运行时 `publish` 默认为 `false`;启用后才推送已验证的架构镜像,并在全部选中任务通过后发布多架构标签。 + +本目录中的 Java、PHP 校验脚本目前由维护者手动执行,尚未在现有发布工作流中调用。 + +## 如何理解检查结果 + +- 退出码 `0` 表示本次实际执行的检查项通过;非零表示失败,需要结合报错和容器日志定位。 +- `SKIP` 表示该项未验证。例如没有提供 PHP 7.3.33 源码包时,其源码校验会跳过,不能据此认定该项通过。 +- 源码检查通过后,仍需对构建出的镜像执行运行校验。容器检查的结论限定于本次镜像版本、架构和脚本覆盖的场景。 +- 生产旧数据迁移、跨主版本升级和真实多机部署需要单独验证;一次临时环境检查不覆盖这些场景。 + +维护时沿用 `check-*` 命名,将共享校验集中放在本目录,并在本说明中补齐用途、输入和依赖。涉及仓库文件时,通过脚本自身位置定位仓库根目录,保持从不同工作目录执行的行为一致。 diff --git a/tests/check-java-runtime.sh b/checks/check-java-runtime.sh similarity index 100% rename from tests/check-java-runtime.sh rename to checks/check-java-runtime.sh diff --git a/checks/check-mysql-cluster.sh b/checks/check-mysql-cluster.sh new file mode 100644 index 0000000..d3d16a6 --- /dev/null +++ b/checks/check-mysql-cluster.sh @@ -0,0 +1,154 @@ +#!/usr/bin/env bash +set -euo pipefail + +image="${1:-${IMAGE:-}}" +[[ -n "$image" ]] || { echo 'Usage: check-mysql-cluster.sh IMAGE' >&2; exit 1; } +test_dir="$(mktemp -d)" +prefix="runtime-mysql-$$-$RANDOM" +network="$prefix-network" +master="$prefix-master" +replica="$prefix-replica" +master_volume="$prefix-master-data" +replica_volume="$prefix-replica-data" +root_password="Root'q\\secret!42" +replication_password="Replica'q\\secret!42" + +cleanup() { + result=$? + if (( result != 0 )); then + docker logs "$master" >&2 || true + docker logs "$replica" >&2 || true + fi + docker rm -fv "$replica" "$master" >/dev/null 2>&1 || true + docker volume rm "$replica_volume" "$master_volume" >/dev/null 2>&1 || true + docker network rm "$network" >/dev/null 2>&1 || true + rm -rf "$test_dir" + exit "$result" +} +trap cleanup EXIT + +query() { + docker exec -e MYSQL_PWD="$root_password" "$1" mysql \ + --user=root --batch --skip-column-names --execute="$2" +} + +wait_healthy() { + local container="$1" + for (( attempt=0; attempt<180; attempt++ )); do + if docker exec "$container" /opt/bitnami/scripts/mysql/healthcheck.sh >/dev/null 2>&1; then + return + fi + [[ "$(docker inspect --format '{{.State.Running}}' "$container")" == true ]] || return 1 + sleep 1 + done + echo "Health check timed out: $container" >&2 + return 1 +} + +wait_count() { + local expected="$1" + for (( attempt=0; attempt<120; attempt++ )); do + if [[ "$(query "$replica" 'SELECT COUNT(*) FROM ha_test.records' 2>/dev/null || true)" == "$expected" ]]; then + return + fi + sleep 1 + done + query "$replica" 'SHOW REPLICA STATUS\G' >&2 || true + return 1 +} + +run_replica() { + docker run -d --name "$replica" --network "$network" \ + -e MYSQL_REPLICATION_MODE=slave -e MYSQL_REPLICATION_USER=replicator \ + -e MYSQL_REPLICATION_PASSWORD="$replication_password" -e MYSQL_ROOT_PASSWORD=unused-on-dump-replica \ + -e MYSQL_MASTER_HOST="$master" -e MYSQL_MASTER_ROOT_PASSWORD="$root_password" \ + -e MYSQL_REPLICATION_SLAVE_DUMP=true -e MYSQL_AUTHENTICATION_PLUGIN=mysql_native_password \ + -v "$replica_volume:/bitnami/mysql/data" \ + -v "$test_dir/my.cnf:/opt/bitnami/mysql/conf/my.cnf:ro" "$image" >/dev/null +} + +cat > "$test_dir/my.cnf" <<'EOF' +[mysqld] +basedir=/opt/bitnami/mysql +plugin_dir=/opt/bitnami/mysql/lib/plugin +port=3306 +bind_address=0.0.0.0 +tmpdir=/opt/bitnami/mysql/tmp +socket=/opt/bitnami/mysql/tmp/mysql.sock +pid_file=/opt/bitnami/mysql/tmp/mysqld.pid +log_error=/opt/bitnami/mysql/logs/mysqld.log +datadir=/bitnami/mysql/data +[client] +socket=/opt/bitnami/mysql/tmp/mysql.sock +plugin_dir=/opt/bitnami/mysql/lib/plugin +EOF +chmod 0755 "$test_dir" +chmod 0644 "$test_dir/my.cnf" +docker network create "$network" >/dev/null +docker volume create "$master_volume" >/dev/null +docker volume create "$replica_volume" >/dev/null +docker run -d --name "$master" --network "$network" \ + -e MYSQL_REPLICATION_MODE=master -e MYSQL_REPLICATION_USER=replicator \ + -e MYSQL_REPLICATION_PASSWORD="$replication_password" -e MYSQL_ROOT_PASSWORD="$root_password" \ + -e MYSQL_AUTHENTICATION_PLUGIN=mysql_native_password \ + -v "$master_volume:/bitnami/mysql/data" \ + -v "$test_dir/my.cnf:/opt/bitnami/mysql/conf/my.cnf" "$image" >/dev/null +wait_healthy "$master" +[[ "$(docker exec "$master" id -u)" == 1001 ]] +docker exec -e MYSQL_PWD="$root_password" "$master" mysqladmin --user=root ping >/dev/null +[[ "$(query "$master" "SELECT plugin FROM mysql.user WHERE User='root' AND Host='localhost'")" == mysql_native_password ]] +query "$master" "CREATE DATABASE ha_test; CREATE TABLE ha_test.records (id INT PRIMARY KEY, content VARCHAR(80)); INSERT INTO ha_test.records VALUES (1,'before replica'),(2,'existing data'),(3,'snapshot');" >/dev/null +docker exec -e MYSQL_PWD="$root_password" "$master" mysqldump --user=root \ + --single-transaction --routines ha_test > "$test_dir/backup.sql" +query "$master" 'CREATE DATABASE ha_restore' >/dev/null +docker exec -i -e MYSQL_PWD="$root_password" "$master" mysql --user=root ha_restore < "$test_dir/backup.sql" +[[ "$(query "$master" 'SELECT COUNT(*) FROM ha_restore.records')" == 3 ]] + +run_replica +wait_healthy "$replica" +wait_count 3 +[[ "$(query "$replica" 'SELECT content FROM ha_test.records WHERE id=2')" == 'existing data' ]] +[[ "$(query "$replica" 'SELECT @@super_read_only')" == 1 ]] +if query "$replica" "INSERT INTO ha_test.records VALUES (99,'must fail')" >/dev/null 2>&1; then + echo 'Replica unexpectedly accepted a write' >&2 + exit 1 +fi +query "$master" "INSERT INTO ha_test.records VALUES (4,'incremental');" >/dev/null +wait_count 4 +server_id="$(query "$replica" 'SELECT @@server_id')" +docker exec "$replica" rm /bitnami/mysql/data/.1panel-replication-mode +docker stop "$replica" >/dev/null +query "$master" "INSERT INTO ha_test.records VALUES (5,'while replica stopped');" >/dev/null +docker rm -v "$replica" >/dev/null +run_replica +wait_healthy "$replica" +wait_count 5 +[[ "$(query "$replica" 'SELECT @@server_id')" == "$server_id" ]] +if docker run --rm -e MYSQL_REPLICATION_MODE=slave -e MYSQL_REPLICATION_USER=replicator \ + -e MYSQL_REPLICATION_PASSWORD="$replication_password" -e MYSQL_ROOT_PASSWORD="$root_password" \ + -e MYSQL_MASTER_HOST="$master" -e MYSQL_MASTER_ROOT_PASSWORD="$root_password" \ + -v "$master_volume:/bitnami/mysql/data" "$image" > "$test_dir/wrong-role.log" 2>&1; then + echo 'Existing master data unexpectedly accepted slave mode' >&2 + exit 1 +fi +grep -q 'different replication role' "$test_dir/wrong-role.log" +docker exec "$master" rm /bitnami/mysql/data/.1panel-replication-mode +docker restart "$master" >/dev/null +wait_healthy "$master" +query "$master" "INSERT INTO ha_test.records VALUES (6,'after master restart');" >/dev/null +wait_count 6 +[[ "$(query "$replica" "SELECT COUNT(*) FROM performance_schema.replication_applier_status WHERE SERVICE_STATE='ON'")" == 1 ]] +[[ "$(query "$replica" "SELECT COUNT(*) FROM performance_schema.replication_connection_status WHERE SERVICE_STATE='ON'")" == 1 ]] +docker exec -e MYSQL_PWD="$root_password" "$replica" mysql --user=root \ + --execute='SHOW REPLICA STATUS\G' > "$test_dir/replica-status.log" +grep -Eq '^[[:space:]]*Replica_SQL_Running: Yes$' "$test_dir/replica-status.log" +grep -Eq '^[[:space:]]*Replica_IO_Running: Yes$' "$test_dir/replica-status.log" +if docker run --rm -e MYSQL_REPLICATION_MODE=master -e MYSQL_REPLICATION_USER=replicator \ + -e MYSQL_REPLICATION_PASSWORD="$replication_password" -e MYSQL_ROOT_PASSWORD="$root_password" \ + "$image" bash -c 'touch /bitnami/mysql/data/.1panel-initializing; exec /usr/local/bin/1panel-mysql-entrypoint mysqld' \ + > "$test_dir/unfinished-init.log" 2>&1; then + echo 'Incomplete initialization unexpectedly accepted' >&2 + exit 1 +fi +grep -q 'previous initialization did not finish' "$test_dir/unfinished-init.log" +echo "MySQL cluster runtime checks passed: $image" diff --git a/tests/check-php-eol-backport.py b/checks/check-php-eol-backport.py similarity index 100% rename from tests/check-php-eol-backport.py rename to checks/check-php-eol-backport.py diff --git a/tests/check-php-legacy-backport.py b/checks/check-php-legacy-backport.py similarity index 100% rename from tests/check-php-legacy-backport.py rename to checks/check-php-legacy-backport.py diff --git a/tests/check-php-legacy-runtime.py b/checks/check-php-legacy-runtime.py similarity index 100% rename from tests/check-php-legacy-runtime.py rename to checks/check-php-legacy-runtime.py diff --git a/tests/check-php-pecl-source.py b/checks/check-php-pecl-source.py similarity index 96% rename from tests/check-php-pecl-source.py rename to checks/check-php-pecl-source.py index 42172e0..46e82de 100644 --- a/tests/check-php-pecl-source.py +++ b/checks/check-php-pecl-source.py @@ -31,5 +31,5 @@ assert 'file: php/${{ matrix.phpVersion }}/Dockerfile' in workflow assert 'tags: 1panel/php:${{ matrix.imageVersion }}-fpm' in workflow assert 'context: php/5.6.40' in (root / '.github/workflows/php5-release.yml').read_text() -subprocess.run(['bash', '-n', str(root / 'tests/check-php-pecl.sh')], check=True) +subprocess.run(['bash', '-n', str(root / 'checks/check-php-pecl.sh')], check=True) print('PASS: seven PECL bootstraps, RUN shell syntax, legacy CA and release contexts') diff --git a/tests/check-php-pecl.sh b/checks/check-php-pecl.sh similarity index 82% rename from tests/check-php-pecl.sh rename to checks/check-php-pecl.sh index 9df7e33..73d6d02 100755 --- a/tests/check-php-pecl.sh +++ b/checks/check-php-pecl.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -docker run --rm -i --entrypoint sh "${1:?Usage: bash tests/check-php-pecl.sh IMAGE}" <<'SH' +docker run --rm -i --entrypoint sh "${1:?Usage: bash checks/check-php-pecl.sh IMAGE}" <<'SH' set -eu pecl version pecl remote-info apcu diff --git a/checks/check-postgresql-cluster.sh b/checks/check-postgresql-cluster.sh new file mode 100644 index 0000000..f996345 --- /dev/null +++ b/checks/check-postgresql-cluster.sh @@ -0,0 +1,238 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +image="${1:-${IMAGE:-1panel/postgresql-cluster:18}}" +prefix="1panel-pg-check-$(date +%s)-$$" +network="$prefix-network" +master="$prefix-master" +slave="$prefix-slave" +volumes=("$prefix-master-data" "$prefix-master-conf" "$prefix-slave-data" "$prefix-slave-conf" "$prefix-invalid-data" "$prefix-invalid-conf" "$prefix-failed-data" "$prefix-failed-conf" "$prefix-major-data") +password=$'pg\'"\\:$ secret' +replication_user=$'replica\'"\\:$ user' +replication_password=$'repl\'"\\:$ secret' + +cleanup() { + result=$? + if (( result != 0 )); then + docker logs "$master" >&2 || true + docker logs "$slave" >&2 || true + fi + docker rm -fv "$master" "$slave" "$prefix-invalid" "$prefix-failed" "$prefix-role" "$prefix-major" >/dev/null 2>&1 || true + for volume in "${volumes[@]}"; do + docker volume rm "$volume" >/dev/null 2>&1 || true + done + docker network rm "$network" >/dev/null 2>&1 || true + exit "$result" +} +trap cleanup EXIT + +wait_healthy() { + container="$1" + for (( attempt=0; attempt<90; attempt++ )); do + status="$(docker inspect --format '{{.State.Status}} {{if .State.Health}}{{.State.Health.Status}}{{end}}' "$container")" + if [[ "$status" == 'running healthy' ]]; then + return + fi + if [[ "$status" == exited* || "$status" == dead* ]]; then + printf >&2 '%s stopped before becoming healthy\n' "$container" + return 1 + fi + sleep 1 + done + printf >&2 '%s did not become healthy\n' "$container" + return 1 +} + +sql() { + docker exec "$1" psql -U postgres -d postgres -p "$2" -Atqc "$3" +} + +wait_rows() { + expected="$1" + for (( attempt=0; attempt<60; attempt++ )); do + actual="$(sql "$slave" 55433 'SELECT count(*) FROM cluster_probe' 2>/dev/null || true)" + if [[ "$actual" == "$expected" ]]; then + return + fi + sleep 1 + done + printf >&2 'Expected %s replicated rows, got %s\n' "$expected" "$actual" + return 1 +} + +docker image inspect "$image" >/dev/null +major="$(docker run --rm "$image" bash -ec 'printf "%s" "$PG_MAJOR"')" +case "$major" in + 15|16|17|18) ;; + *) printf >&2 'Unsupported PostgreSQL major: %s\n' "$major"; exit 1 ;; +esac +docker network create "$network" >/dev/null +for volume in "${volumes[@]}"; do + docker volume create "$volume" >/dev/null +done + +docker run --rm --user root \ + -v "${volumes[1]}:/conf" -v "${volumes[3]}:/slave-conf" \ + -v "${volumes[4]}:/invalid" "$image" bash -ec ' + printf "listen_addresses = '\''*'\''\nshared_buffers = '\''32MB'\''\n" > /conf/postgresql.conf + printf "listen_addresses = '\''*'\''\nshared_buffers = '\''48MB'\''\n" > /slave-conf/postgresql.conf + mkdir -p /invalid/data + printf "preserve me\n" > /invalid/data/user-file + chown -R 1001:1001 /conf /slave-conf /invalid + ' + +docker run -d --name "$master" --network "$network" --network-alias pg-master \ + -e POSTGRESQL_REPLICATION_MODE=master -e POSTGRESQL_PORT_NUMBER=55432 \ + -e "POSTGRESQL_PASSWORD=$password" -e "POSTGRESQL_REPLICATION_USER=$replication_user" \ + -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ + -v "${volumes[0]}:/bitnami/postgresql" -v "${volumes[1]}:/bitnami/postgresql/conf" "$image" >/dev/null +wait_healthy "$master" +[[ "$(sql "$master" 55432 'SHOW shared_buffers')" == 32MB ]] +[[ "$(docker exec "$master" id -u)" == 1001 ]] +[[ "$(sql "$master" 55432 "SELECT current_setting('server_version_num')::integer / 10000")" == "$major" ]] +[[ "$(docker exec -e "PGPASSWORD=$password" "$master" psql -h 127.0.0.1 -p 55432 -U postgres -d postgres -Atqc 'SELECT 1')" == 1 ]] +master_ip="$(docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$master")" +[[ "$(docker exec -e "PGPASSWORD=$password" "$master" psql -h "$master_ip" -p 55432 -U postgres -d postgres -Atqc 'SELECT 1')" == 1 ]] +if docker exec -e PGPASSWORD=incorrect "$master" psql -h 127.0.0.1 -p 55432 -U postgres -d postgres -Atqc 'SELECT 1' >/dev/null 2>&1; then + printf >&2 'Primary unexpectedly accepted an incorrect password\n' + exit 1 +fi +sql "$master" 55432 "CREATE TABLE cluster_probe (id integer PRIMARY KEY, value text); INSERT INTO cluster_probe VALUES (1, 'before-replica');" >/dev/null +master_id="$(sql "$master" 55432 'SELECT system_identifier FROM pg_control_system()')" +docker exec -i "$master" psql -U postgres -d postgres -p 55432 -v ON_ERROR_STOP=1 \ + --set replication_user="$replication_user" >/dev/null <<'SQL' +SELECT format('DROP ROLE %I', :'replication_user') \gexec +SQL +docker exec "$master" bash -ec ' + printf "local all all peer\nhost all all 127.0.0.1/32 scram-sha-256\n" > "$PGDATA/pg_hba.conf" + rm /bitnami/postgresql/conf/pg_hba.conf +' +docker restart "$master" >/dev/null +wait_healthy "$master" +[[ "$(sql "$master" 55432 'SELECT system_identifier FROM pg_control_system()')" == "$master_id" ]] +[[ "$(docker exec -e "PGPASSWORD=$password" "$master" psql -h 127.0.0.1 -p 55432 -U postgres -d postgres -Atqc 'SELECT 1')" == 1 ]] +if docker exec -e "PGPASSWORD=$password" "$master" psql -h "$master_ip" -p 55432 -U postgres -d postgres -Atqc 'SELECT 1' >/dev/null 2>&1; then + printf >&2 'Primary copied authentication unexpectedly bypassed the IP whitelist\n' + exit 1 +fi + +docker run -d --name "$slave" --network "$network" \ + -e POSTGRESQL_REPLICATION_MODE=slave -e POSTGRESQL_PORT_NUMBER=55433 \ + -e POSTGRESQL_MASTER_HOST=pg-master -e POSTGRESQL_MASTER_PORT_NUMBER=55432 \ + -e "POSTGRESQL_PASSWORD=$password" -e "POSTGRESQL_REPLICATION_USER=$replication_user" \ + -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ + -v "${volumes[2]}:/bitnami/postgresql" -v "${volumes[3]}:/bitnami/postgresql/conf" "$image" >/dev/null +wait_healthy "$slave" +[[ "$(sql "$slave" 55433 'SELECT pg_is_in_recovery()')" == t ]] +[[ "$(sql "$slave" 55433 'SHOW shared_buffers')" == 48MB ]] +[[ "$(sql "$slave" 55433 'SELECT system_identifier FROM pg_control_system()')" == "$master_id" ]] +docker exec "$slave" cmp /bitnami/postgresql/data/pg_hba.conf /bitnami/postgresql/conf/pg_hba.conf +[[ "$(docker exec -e "PGPASSWORD=$password" "$slave" psql -h 127.0.0.1 -p 55433 -U postgres -d postgres -Atqc 'SELECT 1')" == 1 ]] +slave_ip="$(docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$slave")" +if docker exec -e "PGPASSWORD=$password" "$slave" psql -h "$slave_ip" -p 55433 -U postgres -d postgres -Atqc 'SELECT 1' >/dev/null 2>&1; then + printf >&2 'Standby copied authentication unexpectedly bypassed the IP whitelist\n' + exit 1 +fi +wait_rows 1 +sql "$master" 55432 "INSERT INTO cluster_probe VALUES (2, 'streaming');" >/dev/null +wait_rows 2 +[[ "$(sql "$master" 55432 "SELECT count(*) FROM pg_stat_replication WHERE state = 'streaming'")" == 1 ]] +if sql "$slave" 55433 "INSERT INTO cluster_probe VALUES (3, 'must-fail')" >/dev/null 2>&1; then + printf >&2 'Standby unexpectedly accepted a write\n' + exit 1 +fi +docker stop "$slave" >/dev/null +sql "$master" 55432 "INSERT INTO cluster_probe VALUES (3, 'offline-replica');" >/dev/null +docker start "$slave" >/dev/null +wait_healthy "$slave" +wait_rows 3 +docker restart "$master" >/dev/null +wait_healthy "$master" +sql "$master" 55432 "INSERT INTO cluster_probe VALUES (4, 'restarted-primary');" >/dev/null +wait_rows 4 +[[ "$(docker exec "$slave" stat -c '%u:%g:%a' /bitnami/postgresql/conf/replication.pgpass)" == 1001:1001:600 ]] + +if docker run --name "$prefix-invalid" -e POSTGRESQL_REPLICATION_MODE=slave \ + -e POSTGRESQL_MASTER_HOST=unreachable -e "POSTGRESQL_REPLICATION_USER=$replication_user" \ + -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ + -v "${volumes[4]}:/bitnami/postgresql" -v "${volumes[5]}:/bitnami/postgresql/conf" "$image" >/dev/null 2>&1; then + printf >&2 'Nonempty unrecognized data directory was unexpectedly accepted\n' + exit 1 +fi +[[ "$(docker run --rm -v "${volumes[4]}:/bitnami/postgresql" "$image" cat /bitnami/postgresql/data/user-file)" == 'preserve me' ]] + +docker run --rm --user root -v "${volumes[7]}:/conf" "$image" bash -ec ' + printf "preserve configuration\n" > /conf/user-file + chown -R 1001:1001 /conf +' +if docker run --name "$prefix-failed" --network "$network" \ + -e POSTGRESQL_REPLICATION_MODE=slave -e POSTGRESQL_MASTER_HOST=pg-master \ + -e POSTGRESQL_MASTER_PORT_NUMBER=1 -e "POSTGRESQL_REPLICATION_USER=$replication_user" \ + -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ + -v "${volumes[6]}:/bitnami/postgresql" -v "${volumes[7]}:/bitnami/postgresql/conf" "$image" >/dev/null 2>&1; then + printf >&2 'Clone unexpectedly succeeded against a closed port\n' + exit 1 +fi +[[ "$(docker run --rm -v "${volumes[7]}:/conf" "$image" cat /conf/user-file)" == 'preserve configuration' ]] +[[ -z "$(docker run --rm -v "${volumes[6]}:/bitnami/postgresql" "$image" find /bitnami/postgresql -maxdepth 1 -name '.clone.*' -print)" ]] + +docker stop "$master" >/dev/null +if docker run --name "$prefix-role" -e POSTGRESQL_REPLICATION_MODE=slave \ + -e POSTGRESQL_MASTER_HOST=pg-master -e "POSTGRESQL_REPLICATION_USER=$replication_user" \ + -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ + -v "${volumes[0]}:/bitnami/postgresql" -v "${volumes[1]}:/bitnami/postgresql/conf" "$image" >/dev/null 2>&1; then + printf >&2 'Existing primary was unexpectedly changed into a standby\n' + exit 1 +fi +[[ "$(docker run --rm -v "${volumes[0]}:/bitnami/postgresql" "$image" cat /bitnami/postgresql/data/PG_VERSION)" == "$major" ]] +docker start "$master" >/dev/null +wait_healthy "$master" +[[ "$(sql "$master" 55432 'SELECT system_identifier FROM pg_control_system()')" == "$master_id" ]] +[[ "$(sql "$master" 55432 'SELECT count(*) FROM cluster_probe')" == 4 ]] + +docker stop "$master" >/dev/null +docker rm -v "$master" >/dev/null +docker run --rm --user root -v "${volumes[0]}:/bitnami/postgresql" \ + -v "${volumes[1]}:/bitnami/postgresql/conf" "$image" bash -ec ' + rm -f /bitnami/postgresql/data/pg_hba.conf /bitnami/postgresql/conf/pg_hba.conf + chown root:root /bitnami/postgresql + chmod 700 /bitnami/postgresql + ' +docker run -d --user root --name "$master" --network "$network" --network-alias pg-master \ + -e POSTGRESQL_REPLICATION_MODE=master -e POSTGRESQL_PORT_NUMBER=55432 \ + -e "POSTGRESQL_PASSWORD=$password" -e "POSTGRESQL_REPLICATION_USER=$replication_user" \ + -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ + -v "${volumes[0]}:/bitnami/postgresql" -v "${volumes[1]}:/bitnami/postgresql/conf" "$image" >/dev/null +wait_healthy "$master" +[[ "$(docker exec "$master" stat -c '%u:%g' /bitnami/postgresql)" == 1001:1001 ]] +[[ "$(docker exec "$master" stat -c '%u' /proc/1)" == 1001 ]] +[[ "$(docker exec "$master" grep -Fxc 'local all all peer' /bitnami/postgresql/conf/pg_hba.conf)" == 1 ]] +[[ "$(docker exec -e "PGPASSWORD=$password" "$master" psql -h 127.0.0.1 -p 55432 -U postgres -d postgres -Atqc 'SELECT count(*) FROM cluster_probe')" == 4 ]] +master_ip="$(docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$master")" +[[ "$(docker exec -e "PGPASSWORD=$password" "$master" psql -h "$master_ip" -p 55432 -U postgres -d postgres -Atqc 'SELECT count(*) FROM cluster_probe')" == 4 ]] +if docker exec -e PGPASSWORD=incorrect "$master" psql -h 127.0.0.1 -p 55432 -U postgres -d postgres -Atqc 'SELECT 1' >/dev/null 2>&1; then + printf >&2 'Recovered primary unexpectedly accepted an incorrect password\n' + exit 1 +fi +docker exec --user 1001 "$master" psql -U postgres -d postgres -p 55432 -Atqc "INSERT INTO cluster_probe VALUES (5, 'restored-authentication');" >/dev/null +wait_rows 5 + +other_major="$((major + 1))" +docker run --rm --user root -v "${volumes[8]}:/bitnami/postgresql" "$image" bash -ec ' + mkdir -p /bitnami/postgresql/data + printf "%s\n" "$1" > /bitnami/postgresql/data/PG_VERSION + printf "preserve other major\n" > /bitnami/postgresql/data/user-file + chown -R 1001:1001 /bitnami/postgresql +' -- "$other_major" +if docker run --name "$prefix-major" -e POSTGRESQL_REPLICATION_MODE=master \ + -e "POSTGRESQL_PASSWORD=$password" -e "POSTGRESQL_REPLICATION_USER=$replication_user" \ + -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ + -v "${volumes[8]}:/bitnami/postgresql" "$image" >/dev/null 2>&1; then + printf >&2 'Data from another PostgreSQL major was unexpectedly accepted\n' + exit 1 +fi +docker logs "$prefix-major" 2>&1 | grep -F "Existing data requires PostgreSQL $other_major; this image uses $major" >/dev/null +[[ "$(docker run --rm -v "${volumes[8]}:/bitnami/postgresql" "$image" cat /bitnami/postgresql/data/PG_VERSION)" == "$other_major" ]] +[[ "$(docker run --rm -v "${volumes[8]}:/bitnami/postgresql" "$image" cat /bitnami/postgresql/data/user-file)" == 'preserve other major' ]] + +printf 'PostgreSQL primary/replica checks passed for %s\n' "$image" diff --git a/checks/check-redis-cluster.sh b/checks/check-redis-cluster.sh new file mode 100644 index 0000000..2c01ddc --- /dev/null +++ b/checks/check-redis-cluster.sh @@ -0,0 +1,153 @@ +#!/bin/bash +set -euo pipefail + +IMAGE="${1:-${IMAGE:-}}" +: "${IMAGE:?Pass the Redis replication image as the first argument or set IMAGE}" +prefix="1panel-redis-check-$(date +%s)-$$" +master="$prefix-master" +replica="$prefix-slave" +master_data="$prefix-master-data" +replica_data="$prefix-slave-data" +master_conf="$prefix-conf" +master_password=$'master space "quote" \\backslash $dollar `literal`' +replica_password=$'slave space "quote" \\backslash $different `literal`' +volumes=() +containers=() +network_created=false + +cleanup() { + if (( ${#containers[@]} )); then + docker rm -fv "${containers[@]}" >/dev/null 2>&1 || true + fi + if (( ${#volumes[@]} )); then + docker volume rm "${volumes[@]}" >/dev/null 2>&1 || true + fi + if [[ "$network_created" == true ]]; then + docker network rm "$prefix" >/dev/null 2>&1 || true + fi +} +trap cleanup EXIT + +redis_version=$(docker image inspect --format '{{range .Config.Env}}{{println .}}{{end}}' "$IMAGE" | sed -n 's/^REDIS_VERSION=//p') +case "$redis_version" in + 6.2.*) aof_file=/bitnami/redis/data/appendonly.aof ;; + 7.4.*|8.10.*) aof_file=/bitnami/redis/data/appendonlydir/appendonly.aof.manifest ;; + *) + printf 'Unsupported Redis test version: %s\n' "$redis_version" >&2 + exit 1 + ;; +esac + +master_cli() { + docker exec -e REDISCLI_AUTH="$master_password" "$master" redis-cli --raw -p 6380 "$@" +} + +replica_cli() { + docker exec -e REDISCLI_AUTH="$replica_password" "$replica" redis-cli --raw -p 6381 "$@" +} + +wait_for() { + local expected="$1" + shift + local result attempt + for (( attempt=0; attempt<60; attempt++ )); do + if result=$("$@" 2>/dev/null) && [[ "$result" == "$expected" ]]; then + return 0 + fi + sleep 1 + done + printf 'Timed out waiting for %s\n' "$expected" >&2 + docker logs "$master" >&2 || true + docker logs "$replica" >&2 || true + return 1 +} + +containers+=("$prefix-invalid" "$prefix-init") +if docker run --rm --name "$prefix-invalid" -e REDIS_PASSWORD=unused -e REDIS_REPLICATION_MODE=sentinel "$IMAGE" >/dev/null 2>&1; then + printf '%s\n' 'Unsupported replication mode was accepted' >&2 + exit 1 +fi + +docker network create "$prefix" >/dev/null +network_created=true +for volume in "$master_data" "$replica_data" "$master_conf"; do + docker volume create "$volume" >/dev/null + volumes+=("$volume") +done + +docker run --rm --name "$prefix-init" --user 0:0 --entrypoint sh -v "$master_conf:/config" "$IMAGE" -c ' + printf "%s\n" "bind 0.0.0.0" "protected-mode yes" "port 6380" "dir /bitnami/redis/data" "appendonly no" "save \"\"" "maxmemory 64mb" "requirepass config-password" > /config/redis.conf + chown 1001:1001 /config/redis.conf +' >/dev/null + +docker create --name "$master" --network "$prefix" \ + -v "$master_data:/bitnami/redis/data" \ + -v "$master_conf:/opt/bitnami/redis/mounted-etc:ro" \ + -e REDIS_REPLICATION_MODE=master -e REDIS_PASSWORD="$master_password" \ + -e REDIS_EXTRA_FLAGS="--requirepass $master_password" "$IMAGE" >/dev/null +containers+=("$master") +docker create --name "$replica" --network "$prefix" \ + -v "$replica_data:/bitnami/redis/data" \ + -e REDIS_REPLICATION_MODE=slave -e REDIS_PASSWORD="$replica_password" \ + -e REDIS_MASTER_HOST="$master" -e REDIS_MASTER_PORT_NUMBER=6380 \ + -e REDIS_MASTER_PASSWORD="$master_password" -e REDIS_EXTRA_FLAGS='--port 6381' "$IMAGE" >/dev/null +containers+=("$replica") +docker start "$master" "$replica" >/dev/null +wait_for PONG master_cli PING +wait_for PONG replica_cli PING + +[[ "$(master_cli INFO server | tr -d '\r' | sed -n 's/^redis_version://p')" == "$redis_version" ]] +[[ "$(docker exec "$master" id -u)" == 1001 ]] +[[ "$(docker exec "$replica" id -g)" == 1001 ]] +[[ "$(docker exec "$master" readlink /proc/1/exe)" == /usr/local/bin/redis-server ]] +[[ "$(master_cli CONFIG GET appendonly | tail -n 1)" == no ]] +[[ "$(master_cli CONFIG GET maxmemory | tail -n 1)" == 67108864 ]] +[[ "$(replica_cli CONFIG GET appendonly | tail -n 1)" == yes ]] +[[ "$(replica_cli CONFIG SET appendfsync always)" == OK ]] +[[ "$(master_cli SET counter 0)" == OK ]] +wait_for 0 replica_cli GET counter +[[ "$(replica_cli CLIENT PAUSE 10000 WRITE)" == OK ]] + +for value in {1..40}; do + [[ "$(master_cli INCR counter)" == "$value" ]] + [[ "$(master_cli SET "entry:$value" "value $value")" == OK ]] + if [[ "$value" == 1 ]]; then + [[ "$(replica_cli GET counter)" == 0 ]] + wait_for 1 replica_cli GET counter + fi +done +wait_for 40 replica_cli GET counter +wait_for 'value 40' replica_cli GET entry:40 +docker exec "$replica" test -s "$aof_file" +[[ "$(replica_cli SET rejected value)" == 'READONLY '* ]] +[[ "$(master_cli SAVE)" == OK ]] + +docker kill --signal KILL "$master" >/dev/null +docker start "$master" >/dev/null +wait_for PONG master_cli PING +[[ "$(master_cli GET counter)" == 40 ]] +[[ "$(master_cli GET entry:40)" == 'value 40' ]] + +for value in {41..80}; do + [[ "$(master_cli INCR counter)" == "$value" ]] + [[ "$(master_cli SET "entry:$value" "value $value")" == OK ]] + if [[ "$value" == 41 ]]; then + wait_for 41 replica_cli GET counter + wait_for 'value 41' replica_cli GET entry:41 + fi +done +wait_for 80 replica_cli GET counter +wait_for 'value 80' replica_cli GET entry:80 +[[ "$(master_cli SAVE)" == OK ]] +docker stop --time 10 "$master" >/dev/null +docker kill --signal KILL "$replica" >/dev/null +docker start "$replica" >/dev/null +wait_for PONG replica_cli PING +[[ "$(replica_cli GET counter)" == 80 ]] +[[ "$(replica_cli GET entry:80)" == 'value 80' ]] + +docker start "$master" >/dev/null +wait_for PONG master_cli PING +[[ "$(master_cli INCR counter)" == 81 ]] +wait_for 81 replica_cli GET counter +printf 'Redis %s replication, configuration, persistence and reconnect checks passed.\n' "$redis_version" diff --git a/database-ha/README.md b/database-ha/README.md new file mode 100644 index 0000000..af7b854 --- /dev/null +++ b/database-ha/README.md @@ -0,0 +1,70 @@ +# 数据库高可用镜像 + +本目录统一维护 1Panel 高可用使用的 MySQL、PostgreSQL、Redis 主从镜像。数据库引擎来自 Docker Official Images,入口负责兼容现有安装包的环境变量、挂载目录和 `1001:1001` 权限。 + +```text +database-ha/ +├── mysql/ +├── postgresql/ +├── redis/ +└── versions.json +``` + +主从复制与持久化校验脚本统一维护在仓库根目录的 [checks/](../checks/README.md)。 + +## 版本与标签 + +发布版本号与当前安装包保持一致:MySQL、Redis 使用主次版本号,PostgreSQL 使用主版本号。安装包中的 `master`、`slave` 是节点角色,同系列的主从节点使用相同镜像。 + +| 数据库 | 支持系列 | 固定上游镜像 | 发布标签 | +| --- | --- | --- | --- | +| MySQL | 8.4 | `mysql:8.4.13` | `1panel/mysql-cluster:8.4` | +| PostgreSQL | 15 | `postgres:15.20-bookworm` | `1panel/postgresql-cluster:15` | +| PostgreSQL | 16 | `postgres:16.16-bookworm` | `1panel/postgresql-cluster:16` | +| PostgreSQL | 17 | `postgres:17.12-bookworm` | `1panel/postgresql-cluster:17` | +| PostgreSQL | 18 | `postgres:18.7-bookworm` | `1panel/postgresql-cluster:18` | +| Redis | 6.2 | `redis:6.2.24-bookworm` | `1panel/redis-cluster:6.2` | +| Redis | 7.4 | `redis:7.4.12-bookworm` | `1panel/redis-cluster:7.4` | +| Redis | 8.10 | `redis:8.10.3-trixie` | `1panel/redis-cluster:8.10` | + +[versions.json](versions.json) 是构建工作流的版本映射来源。同系列发布新补丁时,更新对应映射,通过主从运行验证后重新发布该系列标签;数据库补丁版本同时记录在镜像标签元数据 `org.opencontainers.image.version` 中。 + +## 版本维护范围 + +截至 2026-11-16,按当前 1Panel 高可用已支持的系列核对上游维护状态,并增加 PostgreSQL 18、Redis 8.10: + +- MySQL 保留 8.4。5.7 已在 2023 年停止开发;8.0 已在 2026 年 4 月达到 EOL,均不纳入构建列表。[官方 EOL 公告](https://www.mysql.com/support/eol-notice.html)、[8.0 发布说明](https://dev.mysql.com/doc/relnotes/mysql/8.0/en/) +- PostgreSQL 保留 15、16、17,增加 18。13 已结束维护;14 已在 2026-11-12 发布最终版本并宣布 EOL。[官方版本策略](https://www.postgresql.org/support/versioning/)、[14 EOL 公告与当前补丁发布](https://www.postgresql.org/about/news/postgresql-187-1712-1616-1520-1425-and-19-rc-2-released-3442/) +- Redis 保留 6.2、7.4,增加当前稳定系列 8.10。6.2 仍处于上游延长安全支持;8.0 在当前官方安全政策中已列为不支持,故不纳入构建列表。官方版本周期页面对 8.0 的日期与安全支持表存在差异,本目录以当前安全补丁支持状态为准。[官方安全政策](https://github.com/redis/redis/security)、[官方版本周期](https://redis.io/docs/latest/operate/oss_and_stack/install/version-mgmt/) + +以上是本目录的镜像维护范围,未修改应用商店已有安装包。历史镜像仍能下载,不作为继续维护该系列的依据。 + +## 构建与验证 + +在 runtime 仓库根目录执行: + +```bash +docker build --build-arg MYSQL_VERSION=8.4.13 -t 1panel/mysql-cluster:8.4 database-ha/mysql +bash checks/check-mysql-cluster.sh 1panel/mysql-cluster:8.4 + +docker build --build-arg POSTGRESQL_VERSION=18.7 -t 1panel/postgresql-cluster:18 database-ha/postgresql +bash checks/check-postgresql-cluster.sh 1panel/postgresql-cluster:18 + +docker build --build-arg REDIS_VERSION=6.2.24 -t 1panel/redis-cluster:6.2 database-ha/redis +bash checks/check-redis-cluster.sh 1panel/redis-cluster:6.2 + +docker build --build-arg REDIS_VERSION=8.10.3 --build-arg REDIS_VARIANT=trixie -t 1panel/redis-cluster:8.10 database-ha/redis +bash checks/check-redis-cluster.sh 1panel/redis-cluster:8.10 +``` + +其他系列按版本表传入固定补丁版本。Redis 6.2、7.4 使用默认 Bookworm 底座;8.10 使用 Trixie 底座,构建时需同时传入 `REDIS_VARIANT=trixie`,工作流会自动选择。详细接口及迁移限制分别见 [MySQL](mysql/README.md)、[PostgreSQL](postgresql/README.md)、[Redis](redis/README.md)。 + +`Build Database Replication Images` 从版本映射生成原生 amd64、arm64 构建及测试矩阵。`database=all`、`version=all` 构建全部八个系列;选择单一数据库后,可以指定该数据库的系列号。已排除的系列和未登记的版本会被拒绝。 + +手动运行默认只构建测试。启用 `publish` 后,全部选中任务通过才合并对应系列的多架构 manifest;发布复用仓库现有 Docker Hub Secrets。工作流尚未执行不代表远程镜像已经发布。 + +## 数据与升级 + +本目录保持现有主从复制拓扑,不包含自动选主、读写代理或 Redis Cluster 分片。持久化数据不能因更换系列标签而跨主版本直接复用;例如 PostgreSQL 17 切换至 18,仍需备份恢复或经过验证的 `pg_upgrade` 流程。Redis 6.2 的单文件 AOF 与 7.4、8.10 的多文件 AOF 也需分别验证,新增 8.10 镜像不代表已验证从旧主版本直接迁移。 + +测试脚本只清理本次创建的临时容器、网络和数据卷。全新主从部署、同系列补丁升级、旧 Bitnami 单主数据迁移和已有完整集群迁移分别记录验证范围,不能相互替代。 diff --git a/database-ha/mysql/Dockerfile b/database-ha/mysql/Dockerfile new file mode 100644 index 0000000..54113bf --- /dev/null +++ b/database-ha/mysql/Dockerfile @@ -0,0 +1,35 @@ +ARG MYSQL_VERSION=8.4.13 +FROM mysql:${MYSQL_VERSION} + +LABEL org.opencontainers.image.source="https://github.com/1Panel-dev/runtime" \ + org.opencontainers.image.title="1Panel MySQL Cluster" \ + org.opencontainers.image.description="MySQL replication image with 1Panel application package compatibility" \ + org.opencontainers.image.vendor="1Panel" + +USER root + +RUN groupmod -g 1001 mysql && \ + usermod -u 1001 -g 1001 mysql && \ + mkdir -p /bitnami/mysql/data /opt/bitnami/mysql/conf /opt/bitnami/mysql/tmp \ + /opt/bitnami/mysql/logs /opt/bitnami/mysql/lib /opt/bitnami/scripts/mysql && \ + ln -s /usr/lib64/mysql/plugin /opt/bitnami/mysql/lib/plugin && \ + chown -R mysql:mysql /bitnami/mysql /opt/bitnami/mysql /var/lib/mysql /var/run/mysqld && \ + command -v mysql && command -v mysqladmin && command -v mysqldump && command -v mysqld + +COPY my.cnf /opt/bitnami/mysql/conf/my.cnf +COPY docker-entrypoint.sh /usr/local/bin/1panel-mysql-entrypoint +COPY healthcheck.sh /opt/bitnami/scripts/mysql/healthcheck.sh + +RUN chmod 0755 /usr/local/bin/1panel-mysql-entrypoint /opt/bitnami/scripts/mysql/healthcheck.sh && \ + chown mysql:mysql /opt/bitnami/mysql/conf/my.cnf && \ + ln -sf /opt/bitnami/mysql/conf/my.cnf /etc/my.cnf + +USER 1001:1001 + +VOLUME /bitnami/mysql/data + +HEALTHCHECK --interval=15s --timeout=5s --start-period=60s --retries=6 \ + CMD ["/opt/bitnami/scripts/mysql/healthcheck.sh"] + +ENTRYPOINT ["/usr/local/bin/1panel-mysql-entrypoint"] +CMD ["mysqld"] diff --git a/database-ha/mysql/README.md b/database-ha/mysql/README.md new file mode 100644 index 0000000..83e53d5 --- /dev/null +++ b/database-ha/mysql/README.md @@ -0,0 +1,74 @@ +# MySQL 主从镜像 + +基于官方 `mysql:8.4.13`,由 1Panel 维护初始化与复制入口,兼容当前应用商店 MySQL 8.4 主从包使用的环境变量和挂载路径。入口为自行实现,并非 Bitnami 源码分支,不下载 Bitnami 的二进制包。 + +## 当前支持版本 + +当前支持的具体数据库版本如下,与[版本清单](../versions.json)保持一致: + +| 支持系列 | 具体数据库版本 | 镜像标签 | 上游基础镜像 | +| --- | --- | --- | --- | +| 8.4 | **8.4.13** | `1panel/mysql-cluster:8.4` | `mysql:8.4.13` | + +对外镜像标签沿用系列版本号,内部上游构建版本固定为 `MYSQL_VERSION=8.4.13`。 + +```bash +docker build --build-arg MYSQL_VERSION=8.4.13 -t 1panel/mysql-cluster:8.4 database-ha/mysql +bash checks/check-mysql-cluster.sh 1panel/mysql-cluster:8.4 +``` + +目标架构为 `linux/amd64` 和 `linux/arm64`,容器默认使用 UID/GID `1001:1001`。宿主机数据目录需由该用户拥有,与当前应用商店初始化脚本一致。 + +## 配置 + +| 环境变量 | 用途 | +| --- | --- | +| `MYSQL_REPLICATION_MODE` | 必填,`master` 或 `slave` | +| `MYSQL_ROOT_PASSWORD` | 必填,主库 root 密码;未执行全量导入时也用于从库 | +| `MYSQL_REPLICATION_USER`、`MYSQL_REPLICATION_PASSWORD` | 必填,复制用户与密码 | +| `MYSQL_MASTER_HOST` | 从库必填,主库地址 | +| `MYSQL_MASTER_PORT_NUMBER` | 主库端口,默认 `3306` | +| `MYSQL_MASTER_ROOT_USER` | 执行初始备份的主库用户,默认 `root` | +| `MYSQL_MASTER_ROOT_PASSWORD` | 从库必填,初始备份账户密码 | +| `MYSQL_REPLICATION_SLAVE_DUMP` | `true` 时在从库首次初始化导入主库全量数据,默认 `false` | +| `MYSQL_AUTHENTICATION_PLUGIN` | `mysql_native_password` 或 `caching_sha2_password`,默认后者 | + +`MYSQL_REPLICATION_SLAVE_DUMP=true` 导入包含账户的全库备份,从库 root 密码以主库备份中的账户为准;健康检查使用 `MYSQL_MASTER_ROOT_PASSWORD`,与当前应用商店默认 root 账户配置一致。使用自定义备份账户时,需确保导入后 root 密码与健康检查凭据一致。 + +保留的路径: + +- 数据:`/bitnami/mysql/data` +- 配置:`/opt/bitnami/mysql/conf/my.cnf`,支持只读挂载 +- 健康检查:`/opt/bitnami/scripts/mysql/healthcheck.sh` +- socket、PID:`/opt/bitnami/mysql/tmp/` +- 错误日志:`/opt/bitnami/mysql/logs/mysqld.log` + +官方客户端默认配置路径 `/etc/my.cnf` 关联到上述兼容配置文件,因此面板直接调用 `mysql`、`mysqladmin`、`mysqldump` 时也会使用正确的 socket;兼容配置仍支持只读挂载。 + +入口覆盖配置中的数据库程序目录、插件目录、数据目录、socket、PID、错误日志、复制日志与 server ID,以兼容现有 Bitnami 布局的配置文件。从库以 `read_only`、`super_read_only` 启动。选择 `mysql_native_password` 时会显式启用 MySQL 8.4 的该认证插件。 + +## 初始化与重启 + +首次启动主库时创建 root 与复制账户。从库全量初始化通过 `mysqldump --single-transaction --source-data=2` 获取数据与对应 binlog 位点,导入后配置复制,从该位点继续接收增量。主库已有数据时也使用该流程。 + +已有数据目录重启时保留复制状态,不重新导入。server ID 与节点角色随数据保存,容器重建后不变;更换主从角色会拒绝启动。首次接入不带本镜像角色标记的旧数据时,通过现有复制通道检查所选角色,不会为已有数据重新配置复制。 + +初始化开始前会写入 `.1panel-initializing` 标记;中断后拒绝自动继续,避免将未完整导入的从库作为正常节点运行。检查错误后,仅对该新建且未投入使用的从库数据目录清空重建,不要清理主库或已投产的数据。 + +## 范围 + +当前只支持 MySQL 8.4 主从复制,不包含自动选主、故障切换或代理,不承诺兼容全部 Bitnami 环境变量或自定义初始化脚本,也不提供跨大版本升级。 + +按 2026-11-16 的上游维护状态,原应用包中的 MySQL 5.7、8.0 已排除:MySQL 官方公告记录 5.7 自 2023-10-25、8.0 自 2026-04-21 转入 Sustaining Support;[8.0 发布说明](https://dev.mysql.com/doc/relnotes/mysql/8.0/en/)明确该系列随最终版本 8.0.46 在 2026 年 4 月达到 EOL。参见 [MySQL 官方 EOL 公告](https://www.mysql.com/support/eol-notice.html)。 + +MySQL 8.4 仍在维护,[8.4.13 发布说明](https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-13.html)列出了 2026-10-20 的更新与安全修复;[Docker 官方镜像发布清单](https://github.com/docker-library/official-images/blob/master/library/mysql)提供 8.4 的 AMD64、ARM64 镜像,当前维护构建不包含 5.7、8.0。 + +健康检查验证本地 SQL 连接,复制链路状态需要另行检查。旧配置如果包含 MySQL 8.4 已移除的 `default_authentication_plugin`,启动会失败;迁移前应从配置中移除该选项,镜像不会修改宿主机挂载的配置文件。 + +全量导入面向 InnoDB。备份期间不要执行 DDL;非事务表的快照一致性需要停写或另行设计备份。复制使用文件与位点,不自动配置 GTID 或 TLS。主从密码、网络与备份账户权限应按实际部署配置。 + +替换现有 `bitnamilegacy/mysql:8.4` 前,应在数据副本上验证账户、配置、复制状态与备份恢复。测试脚本验证默认客户端查询、备份恢复和复制状态,以及非空主库新增从库、增量追平、只读约束、原生密码认证、容器重建与主库重启;脚本仅清理自己创建的容器、网络和卷。 + +已完成 ARM64、AMD64 镜像构建,并通过两种架构的上述完整容器测试。ARM64 为本机原生运行,AMD64 在 ARM64 主机上通过仿真运行。 + +已在 ARM64 验证旧 `bitnamilegacy/mysql:8.4`(实际 8.4.5)单主数据迁移到本镜像 8.4.13:使用应用商店原配置与 `1001:1001` 数据目录权限,旧数据读取、新写入及重启持久化通过。旧镜像生成测试数据时省略了会触发其自身已移除配置项错误的 `MYSQL_AUTHENTICATION_PLUGIN`,切换本镜像后重新启用该变量。此结果不代表旧从库迁移、GTID 或其他自定义账户配置已经验证。 diff --git a/database-ha/mysql/docker-entrypoint.sh b/database-ha/mysql/docker-entrypoint.sh new file mode 100644 index 0000000..fe247b9 --- /dev/null +++ b/database-ha/mysql/docker-entrypoint.sh @@ -0,0 +1,178 @@ +#!/usr/bin/env bash +set -euo pipefail +umask 077 + +if [[ "${1:0:1}" == '-' ]]; then + set -- mysqld "$@" +fi +if [[ "$1" != mysqld ]]; then + exec "$@" +fi +shift + +fail() { + echo "MySQL cluster: $*" >&2 + exit 1 +} + +sql_literal() { + local value="$1" + value="${value//\\/\\\\}" + value="${value//\'/\'\'}" + printf "'%s'" "$value" +} + +mysql_local() { + MYSQL_PWD="$mysql_password" mysql --defaults-file="$config_file" \ + --protocol=socket --socket="$socket_file" --user=root --batch --skip-column-names "$@" +} + +cleanup_init() { + local result="$1" + MYSQL_PWD="$mysql_password" mysqladmin --defaults-file="$config_file" --socket="$socket_file" \ + --user=root shutdown >/dev/null 2>&1 || true + [[ ! -f "$log_file" ]] || cat "$log_file" >&2 + exit "$result" +} + +role="${MYSQL_REPLICATION_MODE:-}" +[[ "$role" == master || "$role" == slave ]] || fail 'MYSQL_REPLICATION_MODE must be master or slave' +[[ -n "${MYSQL_ROOT_PASSWORD:-}" ]] || fail 'MYSQL_ROOT_PASSWORD is required' +[[ -n "${MYSQL_REPLICATION_USER:-}" && -n "${MYSQL_REPLICATION_PASSWORD:-}" ]] || \ + fail 'MYSQL_REPLICATION_USER and MYSQL_REPLICATION_PASSWORD are required' +[[ "$MYSQL_REPLICATION_USER" != root ]] || fail 'MYSQL_REPLICATION_USER cannot be root' + +if [[ "$role" == slave ]]; then + [[ -n "${MYSQL_MASTER_HOST:-}" && -n "${MYSQL_MASTER_ROOT_PASSWORD:-}" ]] || \ + fail 'MYSQL_MASTER_HOST and MYSQL_MASTER_ROOT_PASSWORD are required' +fi + +config_file=/opt/bitnami/mysql/conf/my.cnf +data_dir=/bitnami/mysql/data +socket_file=/opt/bitnami/mysql/tmp/mysql.sock +pid_file=/opt/bitnami/mysql/tmp/mysqld.pid +log_file=/opt/bitnami/mysql/logs/mysqld.log +mkdir -p "$data_dir" /opt/bitnami/mysql/tmp /opt/bitnami/mysql/logs +[[ ! -e "$data_dir/.1panel-initializing" ]] || \ + fail 'previous initialization did not finish; inspect the logs and recover this unfinished new node before retrying' +if [[ -f "$data_dir/.1panel-replication-mode" ]]; then + [[ "$(cat "$data_dir/.1panel-replication-mode")" == "$role" ]] || fail 'data directory belongs to a different replication role' +fi + +if [[ -f "$data_dir/.1panel-server-id" ]]; then + server_id="$(cat "$data_dir/.1panel-server-id")" +elif [[ -f "$data_dir/auto.cnf" ]]; then + read -r server_id _ < <(cksum "$data_dir/auto.cnf") +else + server_id="$(od -An -N4 -tu4 /dev/urandom | tr -d ' ')" +fi +[[ "$server_id" =~ ^[0-9]+$ ]] && (( server_id > 0 && server_id <= 4294967295 )) || fail 'invalid server ID' + +args=(mysqld "--defaults-file=$config_file" --basedir=/usr --plugin-dir=/usr/lib64/mysql/plugin + "--datadir=$data_dir" "--socket=$socket_file" "--pid-file=$pid_file" "--log-error=$log_file" + "--server-id=$server_id" "--log-bin=$data_dir/mysql-bin" "--relay-log=$data_dir/mysql-relay-bin") +plugin="${MYSQL_AUTHENTICATION_PLUGIN:-caching_sha2_password}" +case "$plugin" in + mysql_native_password) args+=(--mysql-native-password=ON) ;; + caching_sha2_password) ;; + *) fail 'MYSQL_AUTHENTICATION_PLUGIN must be mysql_native_password or caching_sha2_password' ;; +esac +if [[ "$role" == slave ]]; then + args+=(--read-only=ON --super-read-only=ON) +fi +args+=("$@") + +mysql_password="$MYSQL_ROOT_PASSWORD" +if [[ "$role" == slave && "${MYSQL_REPLICATION_SLAVE_DUMP:-false}" == true ]]; then + mysql_password="$MYSQL_MASTER_ROOT_PASSWORD" +fi + +if [[ -d "$data_dir/mysql" && ! -f "$data_dir/.1panel-replication-mode" ]]; then + trap 'cleanup_init "$?"' EXIT + "${args[@]}" --daemonize --skip-networking --read-only=OFF --super-read-only=OFF --skip-replica-start + channels="$(mysql_local --execute="SELECT COUNT(*) FROM performance_schema.replication_connection_configuration WHERE HOST<>''")" + if [[ "$role" == master && "$channels" != 0 || "$role" == slave && "$channels" == 0 ]]; then + fail 'existing data replication channels do not match MYSQL_REPLICATION_MODE' + fi + MYSQL_PWD="$mysql_password" mysqladmin --defaults-file="$config_file" --socket="$socket_file" --user=root shutdown + printf '%s\n' "$role" > "$data_dir/.1panel-replication-mode" + trap - EXIT +fi + +if [[ ! -d "$data_dir/mysql" ]]; then + echo "MySQL cluster: initializing $role" + touch "$data_dir/.1panel-initializing" + mysql_password='' + trap 'cleanup_init "$?"' EXIT + "${args[@]}" --initialize-insecure --read-only=OFF --super-read-only=OFF + "${args[@]}" --daemonize --skip-networking --read-only=OFF --super-read-only=OFF --skip-replica-start + + root_password="$MYSQL_ROOT_PASSWORD" + if [[ "$role" == slave && "${MYSQL_REPLICATION_SLAVE_DUMP:-false}" == true ]]; then + root_password="$MYSQL_MASTER_ROOT_PASSWORD" + fi + mysql_local < 0 && master_port <= 65535 )) || fail 'invalid MYSQL_MASTER_PORT_NUMBER' + master_user="${MYSQL_MASTER_ROOT_USER:-root}" + ready=false + for (( attempt=0; attempt<300; attempt++ )); do + if MYSQL_PWD="$MYSQL_MASTER_ROOT_PASSWORD" mysql --no-defaults --protocol=tcp \ + --host="$MYSQL_MASTER_HOST" --port="$master_port" --user="$master_user" --execute='SELECT 1' >/dev/null 2>&1; then + ready=true + break + fi + sleep 2 + done + [[ "$ready" == true ]] || fail 'master did not become available' + + coordinates='' + if [[ "${MYSQL_REPLICATION_SLAVE_DUMP:-false}" == true ]]; then + dump_file="$data_dir/.1panel-initial-dump.sql" + MYSQL_PWD="$MYSQL_MASTER_ROOT_PASSWORD" mysqldump --no-defaults --protocol=tcp \ + --host="$MYSQL_MASTER_HOST" --port="$master_port" --user="$master_user" \ + --all-databases --single-transaction --quick --source-data=2 --set-gtid-purged=OFF \ + --routines --events --triggers > "$dump_file" + read -r source_file source_position < <(sed -n "s/^-- CHANGE REPLICATION SOURCE TO SOURCE_LOG_FILE='\([^']*\)', SOURCE_LOG_POS=\([0-9]*\);$/\1 \2/p" "$dump_file") + [[ -n "$source_file" && "$source_position" =~ ^[0-9]+$ ]] || fail 'dump did not contain replication coordinates' + mysql_local < "$dump_file" + mysql_local --execute='FLUSH PRIVILEGES' + rm "$dump_file" + coordinates="SOURCE_LOG_FILE=$(sql_literal "$source_file"), SOURCE_LOG_POS=$source_position," + fi + mysql_local < "$data_dir/.1panel-server-id" + printf '%s\n' "$role" > "$data_dir/.1panel-replication-mode" + rm "$data_dir/.1panel-initializing" + trap - EXIT + echo 'MySQL cluster: initialization complete' +fi + +exec "${args[@]}" diff --git a/database-ha/mysql/healthcheck.sh b/database-ha/mysql/healthcheck.sh new file mode 100644 index 0000000..a897d2f --- /dev/null +++ b/database-ha/mysql/healthcheck.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -euo pipefail + +[[ ! -e /bitnami/mysql/data/.1panel-initializing ]] +password="${MYSQL_ROOT_PASSWORD:-}" +if [[ "${MYSQL_REPLICATION_MODE:-}" == slave && "${MYSQL_REPLICATION_SLAVE_DUMP:-false}" == true ]]; then + password="${MYSQL_MASTER_ROOT_PASSWORD:-$password}" +fi +MYSQL_PWD="$password" exec mysql --defaults-file=/opt/bitnami/mysql/conf/my.cnf \ + --protocol=socket --socket=/opt/bitnami/mysql/tmp/mysql.sock --user=root --execute='SELECT 1' >/dev/null diff --git a/database-ha/mysql/my.cnf b/database-ha/mysql/my.cnf new file mode 100644 index 0000000..f0caae1 --- /dev/null +++ b/database-ha/mysql/my.cnf @@ -0,0 +1,12 @@ +[mysqld] +port=3306 +bind-address=0.0.0.0 +character-set-server=utf8mb4 +datadir=/bitnami/mysql/data +socket=/opt/bitnami/mysql/tmp/mysql.sock +pid-file=/opt/bitnami/mysql/tmp/mysqld.pid +log-error=/opt/bitnami/mysql/logs/mysqld.log + +[client] +port=3306 +socket=/opt/bitnami/mysql/tmp/mysql.sock diff --git a/database-ha/postgresql/Dockerfile b/database-ha/postgresql/Dockerfile new file mode 100644 index 0000000..f9b1abd --- /dev/null +++ b/database-ha/postgresql/Dockerfile @@ -0,0 +1,22 @@ +ARG POSTGRESQL_VERSION=18.7 +FROM postgres:${POSTGRESQL_VERSION}-bookworm + +LABEL org.opencontainers.image.source="https://github.com/1Panel-dev/runtime" \ + org.opencontainers.image.title="1Panel PostgreSQL replication" \ + org.opencontainers.image.description="PostgreSQL streaming replication with 1Panel cluster environment variables" + +RUN groupmod -g 1001 postgres && \ + usermod -u 1001 -g 1001 postgres && \ + mkdir -p /bitnami/postgresql/conf && \ + chown -R postgres:postgres /bitnami /var/lib/postgresql /var/run/postgresql + +ENV PGDATA=/bitnami/postgresql/data + +COPY entrypoint.sh /usr/local/bin/1panel-postgresql-entrypoint +COPY healthcheck.sh /usr/local/bin/1panel-postgresql-healthcheck +RUN chmod 755 /usr/local/bin/1panel-postgresql-entrypoint /usr/local/bin/1panel-postgresql-healthcheck + +USER 1001:1001 +HEALTHCHECK --interval=10s --timeout=5s --start-period=30s --retries=5 CMD ["1panel-postgresql-healthcheck"] +ENTRYPOINT ["1panel-postgresql-entrypoint"] +CMD ["postgres"] diff --git a/database-ha/postgresql/README.md b/database-ha/postgresql/README.md new file mode 100644 index 0000000..1261c8b --- /dev/null +++ b/database-ha/postgresql/README.md @@ -0,0 +1,66 @@ +# PostgreSQL 主从复制镜像 + +基于 Docker Official Image `postgres:<版本>-bookworm`,在官方初始化脚本上适配 1Panel PostgreSQL 集群安装包。数据库及系统软件包来自官方镜像,不使用 Bitnami 镜像或其二进制下载服务。构建参数 `POSTGRESQL_VERSION` 默认为 `18.7`,面向 `linux/amd64` 和 `linux/arm64`。 + +## 当前支持版本 + +当前支持的具体数据库版本如下,与[版本清单](../versions.json)保持一致: + +| 支持系列 | 具体数据库版本 | 镜像标签 | 上游基础镜像 | +| --- | --- | --- | --- | +| 15 | **15.20** | `1panel/postgresql-cluster:15` | `postgres:15.20-bookworm` | +| 16 | **16.16** | `1panel/postgresql-cluster:16` | `postgres:16.16-bookworm` | +| 17 | **17.12** | `1panel/postgresql-cluster:17` | `postgres:17.12-bookworm` | +| 18 | **18.7** | `1panel/postgresql-cluster:18` | `postgres:18.7-bookworm` | + +支持范围以 2026-11-16 为准。PostgreSQL 13 已于 2025-11-13 结束维护;PostgreSQL 14 的 2026-11-12 最后一次发布公告已明确宣布结束维护,因此不再提供这两个系列。[官方版本维护策略](https://www.postgresql.org/support/versioning/)、[PostgreSQL 14 EOL 公告及当前补丁版本](https://www.postgresql.org/about/news/postgresql-187-1712-1616-1520-1425-and-19-rc-2-released-3442/)。 + +```bash +docker build -t 1panel/postgresql-cluster:18 database-ha/postgresql +docker build --build-arg POSTGRESQL_VERSION=17.12 -t 1panel/postgresql-cluster:17 database-ha/postgresql +``` + +支持单主、多从的异步流复制。首次启动从库通过 `pg_basebackup` 获取主库已有数据,之后持续接收 WAL。主从可以位于不同主机,通过主库可访问的地址和映射端口连接。该镜像不提供自动选主、故障转移或读写代理;从库长时间离线且所需 WAL 已被回收时,需要运维人员备份并重建从库。 + +## 环境变量 + +| 变量 | 用途 | 默认值 | +| --- | --- | --- | +| `POSTGRESQL_REPLICATION_MODE` | 节点角色,`master` 或 `slave` | `master` | +| `POSTGRESQL_PASSWORD` | 初始化 `postgres` 超级用户密码 | 新主库必填 | +| `POSTGRESQL_REPLICATION_USER` | 专用复制账号,不能为 `postgres` | 必填 | +| `POSTGRESQL_REPLICATION_PASSWORD` | 复制账号密码 | 必填 | +| `POSTGRESQL_MASTER_HOST` | 从库连接的主库地址 | 从库必填 | +| `POSTGRESQL_MASTER_PORT_NUMBER` | 从库连接的主库端口 | `5432` | +| `POSTGRESQL_PORT_NUMBER` | 当前节点内部监听端口 | `5432` | +| `POSTGRESQL_DATABASE` | 新主库初始化的数据库 | `postgres` | + +以上包含现有 1Panel PostgreSQL 15–17 主从安装包使用的所有环境变量,并非 Bitnami 全部变量的完整实现,PostgreSQL 18 沿用相同接口。主库每次启动均确保复制账号存在并应用复制密码;已有数据库的超级用户密码不会随环境变量重置。复制地址、账号和密码不支持换行;引号、反斜杠、冒号、空格、美元符号等按 PostgreSQL 的 SQL、连接参数及密码文件规则转义。 + +## 数据与配置 + +- 数据卷挂载到 `/bitnami/postgresql`,实际数据库目录为 `/bitnami/postgresql/data`。 +- PostgreSQL 18 同样沿用上述兼容目录;其官方基础镜像默认目录已改为 `/var/lib/postgresql/18/docker`,这里由入口脚本显式设置 `PGDATA`,仍须挂载 `/bitnami/postgresql`。 +- 配置可以单独持久化到 `/bitnami/postgresql/conf`,沿用安装包的 `./data:/bitnami/postgresql/conf` 挂载方式。 +- 运行用户和组为 `1001:1001`。绑定挂载的目录必须预先赋予该用户读写权限,现有安装包的 `scripts/init.sh` 已执行对应初始化。显式以 root 启动时仅在准备目录后切换至 postgres 用户运行数据库。 +- 已有 `postgresql.conf` 和 `pg_hba.conf` 会保留。外部认证配置不存在时原样复制数据目录中的 `pg_hba.conf`,包括从库通过 `pg_basebackup` 获取的认证文件,不额外放宽普通登录的 IP 白名单。新主库初始化时生成允许远程 TCP `scram-sha-256` 密码认证的默认规则;两处认证文件都缺失时,默认规则还包含本地 socket `peer` 认证。这不会恢复旧镜像内部未持久化的自定义授权规则。主库仍会幂等追加允许密码认证的复制规则。主库自定义配置应保证 `listen_addresses`、`wal_level=replica` 和 `max_wal_senders` 支持远程复制。 +- 数据目录、认证配置路径、本地 socket 路径和内部端口由入口脚本指定。复制密码存放于配置卷的 `replication.pgpass`,权限为 `0600`,不会放入连接命令参数。 +- 支持官方镜像的 `/docker-entrypoint-initdb.d` 初始化目录,仅在新主库初始化时执行。 + +已有完整数据时直接重启,不重新初始化或克隆。没有 `PG_VERSION` 的非空数据目录会拒绝启动;克隆失败时仅移除本次创建的临时备份目录,不删除已有数据。已有主库目录不能直接当从库运行,已有从库也不能通过修改环境变量自动提升为主库。 + +## 旧数据迁移边界 + +支持 PostgreSQL 15–18 各自主版本内的新建主从和本镜像数据的重复启动。已在 ARM64 隔离环境中验证 `bitnamilegacy/postgresql:17` 的 PostgreSQL 17.6 单主样本切换到本镜像 17.12:独立的数据卷和配置卷保持 `1001:1001` 权限,原表可读取,新数据可写入并在重启后保留。该样本缺失的配置及认证文件由本镜像生成默认值,旧镜像内部未持久化的自定义认证规则不会恢复。 + +以上是隔离单主样本验证,不代表所有生产集群均可直接替换镜像。扩展、不同 locale、Bitnami 专属配置路径以及已有从库的迁移仍需单独验证。正式迁移前应完整备份并在隔离环境演练;复杂配置可采用从旧主库逻辑备份、恢复到新主库后重新创建从库的方式。 + +不同主版本的数据不能直接复用,例如 PostgreSQL 17 数据不能直接挂到 `:18` 镜像。脚本检测到数据主版本与镜像不匹配会拒绝启动并保留数据;跨主版本需使用备份恢复或经过验证的 `pg_upgrade` 流程。新增 PostgreSQL 18 镜像不意味着已实现 17→18 的数据库迁移。 + +## 验证 + +```bash +IMAGE=1panel/postgresql-cluster:18 bash checks/check-postgresql-cluster.sh +``` + +验证脚本从镜像读取 `PG_MAJOR`,使用唯一名称的临时网络、容器和卷,覆盖新库远程 SCRAM 认证、已有数据及从库克隆认证文件的白名单允许与拒绝、两处认证文件缺失时的默认规则、持续复制、重复启动、独立配置卷、非默认端口、特殊字符密码、异主版本数据安全拒绝及失败时保留已有目录。只清理本次创建的资源。 diff --git a/database-ha/postgresql/entrypoint.sh b/database-ha/postgresql/entrypoint.sh new file mode 100644 index 0000000..e3dcc1f --- /dev/null +++ b/database-ha/postgresql/entrypoint.sh @@ -0,0 +1,151 @@ +#!/usr/bin/env bash +set -Eeo pipefail + +if [[ "${1:-}" != postgres && "${1:-}" != -* ]]; then + exec "$@" +fi +if [[ "${1:-}" == -* ]]; then + set -- postgres "$@" +fi + +source /usr/local/bin/docker-entrypoint.sh +if _pg_want_help "$@"; then + exec "$@" +fi + +export PGDATA=/bitnami/postgresql/data +export POSTGRES_USER=postgres +export POSTGRES_PASSWORD="${POSTGRESQL_PASSWORD:-}" +export POSTGRES_DB="${POSTGRESQL_DATABASE:-postgres}" +export PGPORT="${POSTGRESQL_PORT_NUMBER:-5432}" +mode="${POSTGRESQL_REPLICATION_MODE:-master}" +conf=/bitnami/postgresql/conf + +case "$mode" in + master|slave) ;; + *) printf >&2 'POSTGRESQL_REPLICATION_MODE must be master or slave\n'; exit 1 ;; +esac +if [[ ! "$PGPORT" =~ ^[0-9]{1,5}$ ]] || (( 10#$PGPORT < 1 || 10#$PGPORT > 65535 )); then + printf >&2 'POSTGRESQL_PORT_NUMBER must be between 1 and 65535\n' + exit 1 +fi +export PGPORT="$((10#$PGPORT))" +if [[ -z "${POSTGRESQL_REPLICATION_USER:-}" || -z "${POSTGRESQL_REPLICATION_PASSWORD:-}" ]]; then + printf >&2 'POSTGRESQL_REPLICATION_USER and POSTGRESQL_REPLICATION_PASSWORD are required\n' + exit 1 +fi +if [[ "$POSTGRESQL_REPLICATION_USER" == postgres ]]; then + printf >&2 'The replication user must differ from postgres\n' + exit 1 +fi +for value in "$POSTGRESQL_REPLICATION_USER" "$POSTGRESQL_REPLICATION_PASSWORD"; do + if [[ "$value" == *$'\n'* || "$value" == *$'\r'* ]]; then + printf >&2 'Replication user and password must not contain line breaks\n' + exit 1 + fi +done + +mkdir -p "$conf" +docker_setup_env +docker_create_db_directories +if [[ "$(id -u)" == 0 ]]; then + chown postgres:postgres /bitnami/postgresql + chown -R postgres:postgres "$conf" + exec gosu postgres "$0" "$@" +fi +if [[ -s "$PGDATA/PG_VERSION" && "$(< "$PGDATA/PG_VERSION")" != "$PG_MAJOR" ]]; then + printf >&2 'Existing data requires PostgreSQL %s; this image uses %s\n' "$(< "$PGDATA/PG_VERSION")" "$PG_MAJOR" + exit 1 +fi +if [[ -z "$DATABASE_ALREADY_EXISTS" && -n "$(find "$PGDATA" -mindepth 1 -maxdepth 1 -print -quit)" ]]; then + printf >&2 'PGDATA is nonempty without PG_VERSION; refusing to initialize or delete its contents\n' + exit 1 +fi +if [[ "$mode" == slave && -n "$DATABASE_ALREADY_EXISTS" && ! -f "$PGDATA/standby.signal" ]]; then + printf >&2 'Existing data is not a standby; refusing to change its role\n' + exit 1 +fi + +if [[ "$mode" == slave ]]; then + : "${POSTGRESQL_MASTER_HOST:?POSTGRESQL_MASTER_HOST is required for a slave}" + master_port="${POSTGRESQL_MASTER_PORT_NUMBER:-5432}" + if [[ ! "$master_port" =~ ^[0-9]{1,5}$ ]] || (( 10#$master_port < 1 || 10#$master_port > 65535 )); then + printf >&2 'POSTGRESQL_MASTER_PORT_NUMBER must be between 1 and 65535\n' + exit 1 + fi + master_port="$((10#$master_port))" + if [[ "$POSTGRESQL_MASTER_HOST" == *$'\n'* || "$POSTGRESQL_MASTER_HOST" == *$'\r'* ]]; then + printf >&2 'Replication host must not contain line breaks\n' + exit 1 + fi + export PGPASSFILE="$conf/replication.pgpass" + umask 077 + credentials=() + for value in "$POSTGRESQL_MASTER_HOST" "$master_port" replication "$POSTGRESQL_REPLICATION_USER" "$POSTGRESQL_REPLICATION_PASSWORD"; do + value="${value//\\/\\\\}" + credentials+=( "${value//:/\\:}" ) + done + (IFS=:; printf '%s\n' "${credentials[*]}") > "$PGPASSFILE" + chmod 600 "$PGPASSFILE" + unset credentials + if [[ -z "$DATABASE_ALREADY_EXISTS" ]]; then + clone_dir="$(mktemp -d /bitnami/postgresql/.clone.XXXXXX)" + trap 'rm -rf -- "$clone_dir"' EXIT + pg_basebackup --host "$POSTGRESQL_MASTER_HOST" --port "$master_port" \ + --username "$POSTGRESQL_REPLICATION_USER" --pgdata "$clone_dir" \ + --wal-method stream --write-recovery-conf --no-password --no-clean + rmdir "$PGDATA" + mv "$clone_dir" "$PGDATA" + trap - EXIT + fi + master_host="${POSTGRESQL_MASTER_HOST//\\/\\\\}" + master_host="${master_host//\'/\\\'}" + replication_user="${POSTGRESQL_REPLICATION_USER//\\/\\\\}" + replication_user="${replication_user//\'/\\\'}" + set -- "$@" -c "primary_conninfo=host='$master_host' port='$master_port' user='$replication_user' passfile='$PGPASSFILE'" +elif [[ -f "$PGDATA/standby.signal" || -f "$PGDATA/recovery.signal" ]]; then + printf >&2 'Existing data is in recovery; refusing to change its role\n' + exit 1 +elif [[ -z "$DATABASE_ALREADY_EXISTS" ]]; then + docker_verify_minimum_env + docker_init_database_dir --auth-host=scram-sha-256 + printf '\nhost all all all scram-sha-256\n' >> "$PGDATA/pg_hba.conf" +fi + +if [[ ! -e "$conf/postgresql.conf" ]]; then + printf "listen_addresses = '*'\nwal_level = replica\nhot_standby = on\nwal_keep_size = '128MB'\n" > "$conf/postgresql.conf" +fi +if [[ ! -e "$conf/pg_hba.conf" ]]; then + if [[ -f "$PGDATA/pg_hba.conf" ]]; then + cp "$PGDATA/pg_hba.conf" "$conf/pg_hba.conf" + else + printf 'local all all peer\nhost all all all scram-sha-256\n' > "$conf/pg_hba.conf" + fi +fi +set -- "$@" -c "config_file=$conf/postgresql.conf" -c "data_directory=$PGDATA" \ + -c "hba_file=$conf/pg_hba.conf" -c "ident_file=$PGDATA/pg_ident.conf" \ + -c unix_socket_directories=/var/run/postgresql -p "$PGPORT" + +if [[ "$mode" == master ]]; then + rule='host replication all all scram-sha-256' + if ! grep -Fqx "$rule" "$conf/pg_hba.conf"; then + printf '\n%s\n' "$rule" >> "$conf/pg_hba.conf" + fi + docker_temp_server_start "$@" + trap 'docker_temp_server_stop' EXIT + PGPASSWORD="$POSTGRES_PASSWORD" docker_process_sql --dbname postgres <<'SQL' +\getenv replication_user POSTGRESQL_REPLICATION_USER +\getenv replication_password POSTGRESQL_REPLICATION_PASSWORD +SELECT format('CREATE ROLE %I WITH LOGIN REPLICATION', :'replication_user') +WHERE NOT EXISTS (SELECT FROM pg_roles WHERE rolname = :'replication_user') \gexec +SELECT format('ALTER ROLE %I WITH LOGIN REPLICATION PASSWORD %L', :'replication_user', :'replication_password') \gexec +SQL + if [[ -z "$DATABASE_ALREADY_EXISTS" ]]; then + docker_setup_db + docker_process_init_files /docker-entrypoint-initdb.d/* + fi + docker_temp_server_stop + trap - EXIT +fi + +exec "$@" diff --git a/database-ha/postgresql/healthcheck.sh b/database-ha/postgresql/healthcheck.sh new file mode 100644 index 0000000..d89f1e4 --- /dev/null +++ b/database-ha/postgresql/healthcheck.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +exec pg_isready -h 127.0.0.1 -p "${POSTGRESQL_PORT_NUMBER:-5432}" -q -U postgres diff --git a/database-ha/redis/Dockerfile b/database-ha/redis/Dockerfile new file mode 100644 index 0000000..6f5a64d --- /dev/null +++ b/database-ha/redis/Dockerfile @@ -0,0 +1,27 @@ +ARG REDIS_VERSION=7.4.12 +ARG REDIS_VARIANT=bookworm +FROM redis:${REDIS_VERSION}-${REDIS_VARIANT} + +LABEL org.opencontainers.image.source="https://github.com/1Panel-dev/runtime" \ + org.opencontainers.image.title="1Panel Redis Replication" \ + org.opencontainers.image.description="Redis replication image with compatibility for 1Panel application packages" \ + org.opencontainers.image.vendor="1Panel" + +USER root + +RUN groupmod --gid 1001 redis && \ + usermod --uid 1001 --gid 1001 redis && \ + mkdir -p /bitnami/redis/data /opt/bitnami/redis/etc \ + /opt/bitnami/redis/mounted-etc /opt/bitnami/redis/logs && \ + chown -R 1001:1001 /bitnami/redis /opt/bitnami/redis /data + +COPY docker-entrypoint.sh /usr/local/bin/1panel-redis-entrypoint +RUN chmod 0755 /usr/local/bin/1panel-redis-entrypoint + +USER 1001:1001 +WORKDIR /bitnami/redis/data + +EXPOSE 6379 +STOPSIGNAL SIGTERM +ENTRYPOINT ["1panel-redis-entrypoint"] +CMD ["redis-server"] diff --git a/database-ha/redis/README.md b/database-ha/redis/README.md new file mode 100644 index 0000000..043a6bb --- /dev/null +++ b/database-ha/redis/README.md @@ -0,0 +1,63 @@ +# Redis 主从镜像 + +基于 Docker Official Image 的 Debian 版本,由 1Panel 维护当前应用高可用安装包需要的启动接口。支持 Redis 6.2、7.4 和 8.10,默认使用 `redis:7.4.12-bookworm`,构建目标为 `linux/amd64` 和 `linux/arm64`。不下载 Bitnami 二进制包,也不包含其完整脚本库。 + +## 当前支持版本 + +当前支持的具体数据库版本如下,与[版本清单](../versions.json)保持一致: + +| 支持系列 | 具体数据库版本 | 镜像标签 | 上游基础镜像 | +| --- | --- | --- | --- | +| 6.2 | **6.2.24** | `1panel/redis-cluster:6.2` | `redis:6.2.24-bookworm` | +| 7.4 | **7.4.12** | `1panel/redis-cluster:7.4` | `redis:7.4.12-bookworm` | +| 8.10 | **8.10.3** | `1panel/redis-cluster:8.10` | `redis:8.10.3-trixie` | + +按 2026-11-16 核对的[官方安全支持政策](https://github.com/redis/redis/security),6.2 处于延长安全支持期,7.4 和 8.10 仍受支持,8.0 已标为不支持,因此不再构建原安装包中的 8.0 系列。[版本周期页面](https://redis.io/docs/latest/operate/oss_and_stack/install/version-mgmt/)与安全政策对 8.0 的状态存在冲突,此处以当前安全补丁支持状态作为筛选依据,不推断其准确 EOL 日期。 + +在仓库根目录构建: + +```bash +docker build --build-arg REDIS_VERSION=6.2.24 -t 1panel/redis-cluster:6.2 database-ha/redis +IMAGE=1panel/redis-cluster:6.2 bash checks/check-redis-cluster.sh +docker build --build-arg REDIS_VERSION=7.4.12 -t 1panel/redis-cluster:7.4 database-ha/redis +IMAGE=1panel/redis-cluster:7.4 bash checks/check-redis-cluster.sh +docker build --build-arg REDIS_VERSION=8.10.3 --build-arg REDIS_VARIANT=trixie -t 1panel/redis-cluster:8.10 database-ha/redis +IMAGE=1panel/redis-cluster:8.10 bash checks/check-redis-cluster.sh +``` + +`REDIS_VERSION` 用于选择受支持系列的补丁版本,默认 `7.4.12`;`REDIS_VARIANT` 用于选择上游 Debian 发行版,默认 `bookworm`。6.2 和 7.4 使用 Debian 12 Bookworm,8.10 使用 Debian 13 Trixie;官方没有 `8.10.3-bookworm` 标签,因此构建 8.10 时需要同时指定两个参数。发行版差异影响基础系统和依赖包,运行时的环境变量、目录和 UID/GID 约定保持一致。 + +运行时使用 `1001:1001`,宿主机挂载目录需要按现有应用包初始化脚本设置该所有者。 + +| 环境变量 | 用途 | +| --- | --- | +| `REDIS_REPLICATION_MODE` | `master` 或 `slave`,默认 `master`;其他值启动失败 | +| `REDIS_PASSWORD` | 本节点密码,必填 | +| `REDIS_MASTER_HOST` | 主节点地址,从节点必填 | +| `REDIS_MASTER_PORT_NUMBER` | 从节点连接的主节点端口,默认 `6379` | +| `REDIS_MASTER_PASSWORD` | 主节点密码,从节点必填,可与本节点密码不同 | +| `REDIS_EXTRA_FLAGS` | 追加的 Redis 启动参数 | + +保留的挂载路径: + +- 数据:`/bitnami/redis/data` +- 外部配置:`/opt/bitnami/redis/mounted-etc/redis.conf` +- 日志:`/opt/bitnami/redis/logs` + +配置优先级与当前 Bitnami 安装包保持一致:存在外部配置时,将其复制为运行配置,跳过密码、复制关系和持久化默认配置的注入;不存在外部配置时,启用 AOF、关闭定时 RDB 快照,按环境变量生成认证和主从关系。日志默认输出到标准输出,挂载的日志目录可供外部配置中的 `logfile` 使用。 + +外部配置之后依次应用 `REDIS_EXTRA_FLAGS`、命令行参数,后者优先级更高。当前应用包主节点挂载的配置为 `appendonly no`,从节点未挂载配置,默认 `appendonly yes`,该差异保留。外部配置中的 `dir`、端口和其他参数由配置文件决定。 + +`REDIS_EXTRA_FLAGS` 沿用原脚本按空白分词的行为,不执行 Shell 表达式,也不解释其中的 Shell 引号。针对当前应用包的 `--requirepass ${REDIS_PASSWORD}`,入口将整段密码作为单个参数处理,可保留空格、引号、反斜杠、美元符号等字符。其他带空白的参数值请通过配置文件或容器命令参数数组传入。 + +本镜像只提供固定主从复制,不提供 Sentinel 自动选主、Redis Cluster 分片或主节点故障后的自动切换。替换镜像不会改变现有复制拓扑。升级应先在数据副本上验证同版本换镜像,再验证同系列补丁升级;不要直接复用跨大版本升级后写入的数据进行降级。6.2 使用单文件 AOF,7.4 和 8.10 使用多文件 AOF;配置文件和数据需要与目标系列匹配,不能将含 `appenddirname` 等新配置的 7.4、8.10 配置直接套给 6.2。 + +验证脚本使用唯一名称创建容器、网络和数据卷,测试不同密码、非默认端口、连续写入、主节点重启持久化、从节点离线 AOF 恢复和重新连接,并根据镜像的 `REDIS_VERSION` 检查对应的单文件或多文件 AOF。复制就绪和重连通过轮询从库中的新值确认;脚本还通过 `CLIENT PAUSE WRITE` 制造受控复制延迟,先确认旧值仍可读取,再等待新值,避免将不同连接上的 `WAIT` 当作同步屏障。脚本仅清理本次创建的资源,不等同于旧 Bitnami 数据升级或真实多主机部署验证。 + +8.10.3 已在本地 ARM64 原生和 AMD64 QEMU 环境通过基础主从、密码、持久化与重连测试。另在 ARM64 使用当前应用包 `8.0-master` 的原始配置和新生成的测试数据,验证了 8.10.3 启动、读写、`SAVE` 和 RDB 重启恢复;该结果仅说明配置兼容,不代表旧 8.0 数据迁移已验证。 + +6.2.24 另已在本地 ARM64 使用当前应用包 `6.2-master` 的原始配置验证启动、写入、RDB 保存和重启恢复;在该配置上通过命令行显式开启 AOF 后,单文件 `appendonly.aof` 的异常退出恢复也已通过。这不等同于旧 Bitnami 6.2 数据迁移验证。 + +另已在本地 ARM64 验证 `bitnamilegacy/redis:7.4`(Redis 7.4.3)到本镜像 7.4.12 的单主节点迁移:使用当前应用包 `7.4-master` 的原始配置和测试生成的 RDB,旧值读取、新值写入、`SAVE` 和重启恢复均通过。数据目录按现有初始化脚本设置为 `1001:1001`;测试使用 `volume-nocopy` 保留目录权限,避免 Docker 将旧镜像的目录权限复制到空数据卷。这不覆盖旧 AOF、多节点存量迁移或其他历史权限、配置组合;迁移前需要核对目录对 UID `1001` 可写,本镜像不会自动修改已有数据的所有者。 + +Redis 及上游镜像的许可证随基础镜像保留,发布前应按所选 Redis 版本核对其许可证要求。 diff --git a/database-ha/redis/docker-entrypoint.sh b/database-ha/redis/docker-entrypoint.sh new file mode 100644 index 0000000..4aa83a4 --- /dev/null +++ b/database-ha/redis/docker-entrypoint.sh @@ -0,0 +1,63 @@ +#!/bin/bash +set -euo pipefail + +if [[ "${1:-}" != "redis-server" ]]; then + exec "$@" +fi +shift + +role="${REDIS_REPLICATION_MODE:-master}" +case "$role" in + master) ;; + slave) + : "${REDIS_MASTER_HOST:?REDIS_MASTER_HOST is required for a slave}" + : "${REDIS_MASTER_PASSWORD:?REDIS_MASTER_PASSWORD is required for a slave}" + master_port="${REDIS_MASTER_PORT_NUMBER:-6379}" + if [[ ! "$master_port" =~ ^[0-9]{1,5}$ ]] || (( 10#$master_port < 1 || 10#$master_port > 65535 )); then + printf '%s\n' 'REDIS_MASTER_PORT_NUMBER must be between 1 and 65535' >&2 + exit 1 + fi + ;; + *) + printf '%s\n' 'REDIS_REPLICATION_MODE must be master or slave' >&2 + exit 1 + ;; +esac +: "${REDIS_PASSWORD:?REDIS_PASSWORD is required}" + +umask 0077 +config=/opt/bitnami/redis/etc/redis.conf +mkdir -p /bitnami/redis/data /opt/bitnami/redis/etc /opt/bitnami/redis/logs +args=("$config") + +if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]]; then + cp /opt/bitnami/redis/mounted-etc/redis.conf "$config" +else + cat > "$config" <<'EOF' +bind 0.0.0.0 +port 6379 +protected-mode yes +daemonize no +logfile "" +dir /bitnami/redis/data +appendonly yes +appendfsync everysec +save "" +EOF + args+=(--requirepass "$REDIS_PASSWORD") + if [[ "$role" == slave ]]; then + args+=(--masterauth "$REDIS_MASTER_PASSWORD" --replicaof "$REDIS_MASTER_HOST" "$master_port") + else + args+=(--masterauth "$REDIS_PASSWORD") + fi +fi + +args+=(--daemonize no) +if [[ "${REDIS_EXTRA_FLAGS:-}" == "--requirepass $REDIS_PASSWORD" ]]; then + args+=(--requirepass "$REDIS_PASSWORD") +elif [[ -n "${REDIS_EXTRA_FLAGS:-}" ]]; then + read -r -a extra_flags <<< "$REDIS_EXTRA_FLAGS" + args+=("${extra_flags[@]}") +fi + +exec redis-server "${args[@]}" "$@" diff --git a/database-ha/versions.json b/database-ha/versions.json new file mode 100644 index 0000000..f83e285 --- /dev/null +++ b/database-ha/versions.json @@ -0,0 +1,16 @@ +{ + "mysql": { + "8.4": "8.4.13" + }, + "postgresql": { + "15": "15.20", + "16": "16.16", + "17": "17.12", + "18": "18.7" + }, + "redis": { + "6.2": "6.2.24", + "7.4": "7.4.12", + "8.10": "8.10.3" + } +} diff --git a/php/EOL-BACKPORT.md b/php/EOL-BACKPORT.md index 70c60ea..363f30f 100644 --- a/php/EOL-BACKPORT.md +++ b/php/EOL-BACKPORT.md @@ -28,7 +28,7 @@ All source builds include a CLI OOM check that requires exit status 1 and verifi Run the source checks, including the separately downloaded official 7.3.33 archive: ```sh -python3 tests/check-php-legacy-backport.py /path/to/php-7.3.33.tar.xz +python3 checks/check-php-legacy-backport.py /path/to/php-7.3.33.tar.xz ``` The check covers all five source checksums, zero-fuzz application, repeated-application rejection, the supplemented guards, and helper rejection of tampered archives/patches. Without the argument, the four checked-in archives are tested and the 7.3 source check is explicitly skipped. @@ -36,7 +36,7 @@ The check covers all five source checksums, zero-fuzz application, repeated-appl For each built image, run: ```sh -python3 tests/check-php-legacy-runtime.py IMAGE +python3 checks/check-php-legacy-runtime.py IMAGE ``` This uses a disposable container with one FPM worker. It checks repeated requests, nested form arrays and copy-on-write, ordinary fatal errors, OOM during input parsing and script execution, worker replacement, skipped shutdown callbacks, real uploads, disabled session upload progress, duplicate headers and the multipart limit. Both FPM OOM cases must exit with code 1 without a crash signal. It compiles a small probe extension against the installed headers and checks allocation/hash overflow behavior, loads the rebuilt OPcache module, and verifies the archived source contains the patched header. Docker, Python 3 and the image's existing PHP build tools are required; the test does not publish images or contact external services. @@ -127,12 +127,12 @@ Building/publishing must be performed separately by the maintainer; these change ## Offline validation -Run `python3 tests/check-php-eol-backport.py` from the repository. It checks shell syntax, helper parity, version gates and the existing four-version 8.2+ workflow's Python Dockerfile assembly. It never builds images or triggers Actions. +Run `python3 checks/check-php-eol-backport.py` from the repository. It checks shell syntax, helper parity, version gates and the existing four-version 8.2+ workflow's Python Dockerfile assembly. It never builds images or triggers Actions. For full source checks, download the official `php-7.4.33.tar.xz`, `php-8.0.30.tar.xz` and `php-8.1.34.tar.xz` plus each fixed commit's `.patch` into a separate directory, naming the patches `.patch`, then run: ```sh -python3 tests/check-php-eol-backport.py /path/to/source-inputs +python3 checks/check-php-eol-backport.py /path/to/source-inputs ``` This verifies all pinned SHA256 values, applies each patch to temporary extracted source with zero fuzz, rejects a second application and rejects tampered inputs. The helper's `--check-source VERSION SOURCE.tar.xz COMMIT.patch` mode runs an individual offline check.