From 51ee7f72cdf4ae1f7aab423ba70874eb987de6da Mon Sep 17 00:00:00 2001 From: yeasy Date: Wed, 25 Mar 2026 22:47:27 -0700 Subject: [PATCH 1/4] Bump version to v1.7.0 --- CHANGELOG.md | 7 +++++++ README.md | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfecbba..99966ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # 修订记录 +* 1.7.0 2026-03-25 + * 精简 CI 流程,移除遗留的 vuepress 构建,统一使用 mdpress + * 升级 etcd 集群示例从 v3.4.0 到 v3.5.17 + * 更新 npm 镜像为 npmmirror.com,PHP 升级到 8.3 + * 移除 Compose 已废弃的 version 字段 + * 升级所有 CI Actions 到最新版本 + * 1.6.1 2026-02-28 * 修正数据卷 `--mount` 与 `-v` 的行为差异及数据卷管理说明 * 补充 Docker Hub 限流机制说明,区分 pull rate limit 与 abuse rate limit diff --git a/README.md b/README.md index d879a92..c320270 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![图](https://img.shields.io/github/stars/yeasy/docker_practice.svg?style=social&label=Stars)](https://github.com/yeasy/docker_practice) [![图](https://img.shields.io/github/release/yeasy/docker_practice/all.svg)](https://github.com/yeasy/docker_practice/releases) [![图](https://img.shields.io/badge/Based-Docker%20Engine%20v29.x-blue.svg)](https://docs.docker.com/engine/release-notes/) [![图](https://img.shields.io/badge/Docker%20%E6%8A%80%E6%9C%AF%E5%85%A5%E9%97%A8%E4%B8%8E%E5%AE%9E%E6%88%98-jd.com-red.svg)][1] -**v1.6.6** +**v1.7.0** [Docker](https://www.docker.com) 是个划时代的开源项目,它彻底释放了计算虚拟化的威力,极大提高了应用的维护效率,降低了云计算应用开发的成本!使用 Docker,可以让应用的部署、测试和分发都变得前所未有的高效和轻松! diff --git a/package.json b/package.json index 5d7c9dd..19a6aae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docker_practice", - "version": "1.5.4", + "version": "1.7.0", "description": "docker_practice", "main": "index.js", "devDependencies": { From 6dbae98f8eb96196a9c229e7560a4c9099517b40 Mon Sep 17 00:00:00 2001 From: yeasy Date: Wed, 25 Mar 2026 22:53:05 -0700 Subject: [PATCH 2/4] Auto-create release on tag push --- .github/workflows/release-pdf.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-pdf.yml b/.github/workflows/release-pdf.yml index 8707305..c4d5a65 100644 --- a/.github/workflows/release-pdf.yml +++ b/.github/workflows/release-pdf.yml @@ -1,8 +1,9 @@ name: Build PDF on Release on: - release: - types: [published] + push: + tags: + - 'v*' workflow_dispatch: permissions: @@ -34,10 +35,11 @@ jobs: - name: Build PDF run: mdpress build --format pdf --output docker_practice.pdf - - name: Upload PDF to Release - if: github.event_name == 'release' + - name: Create Release and upload PDF + if: startsWith(github.ref, 'refs/tags/') uses: softprops/action-gh-release@v2 with: + generate_release_notes: true files: docker_practice.pdf - name: Upload PDF as artifact From 092c85ad009bcdbb268e62edd777545f73e9d313 Mon Sep 17 00:00:00 2001 From: yeasy Date: Wed, 25 Mar 2026 23:05:52 -0700 Subject: [PATCH 3/4] Install CJK fonts for PDF rendering --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/release-pdf.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2e70824..00959b5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - name: Install Chromium + - name: Install Chromium and CJK fonts run: | sudo apt-get update - sudo apt-get install -y chromium-browser + sudo apt-get install -y chromium-browser fonts-noto-cjk fonts-noto-cjk-extra - name: Install mdpress (latest) run: | LATEST_TAG=$(curl -fsSL https://api.github.com/repos/yeasy/mdpress/releases/latest | jq -r .tag_name) diff --git a/.github/workflows/release-pdf.yml b/.github/workflows/release-pdf.yml index c4d5a65..8e7e266 100644 --- a/.github/workflows/release-pdf.yml +++ b/.github/workflows/release-pdf.yml @@ -17,10 +17,10 @@ jobs: - name: Checkout code uses: actions/checkout@v6 - - name: Install Chromium + - name: Install Chromium and CJK fonts run: | sudo apt-get update - sudo apt-get install -y chromium-browser + sudo apt-get install -y chromium-browser fonts-noto-cjk fonts-noto-cjk-extra - name: Install mdpress (latest) run: | From 185b39637b3075ca7a59d9def92a84aa637bc8f9 Mon Sep 17 00:00:00 2001 From: yeasy Date: Wed, 25 Mar 2026 23:09:26 -0700 Subject: [PATCH 4/4] Add PDF download link to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c320270..a0439bc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![图](https://img.shields.io/github/stars/yeasy/docker_practice.svg?style=social&label=Stars)](https://github.com/yeasy/docker_practice) [![图](https://img.shields.io/github/release/yeasy/docker_practice/all.svg)](https://github.com/yeasy/docker_practice/releases) [![图](https://img.shields.io/badge/Based-Docker%20Engine%20v29.x-blue.svg)](https://docs.docker.com/engine/release-notes/) [![图](https://img.shields.io/badge/Docker%20%E6%8A%80%E6%9C%AF%E5%85%A5%E9%97%A8%E4%B8%8E%E5%AE%9E%E6%88%98-jd.com-red.svg)][1] -**v1.7.0** +**v1.7.0** | [PDF 下载](https://github.com/yeasy/docker_practice/releases/latest/download/docker_practice.pdf) [Docker](https://www.docker.com) 是个划时代的开源项目,它彻底释放了计算虚拟化的威力,极大提高了应用的维护效率,降低了云计算应用开发的成本!使用 Docker,可以让应用的部署、测试和分发都变得前所未有的高效和轻松!