diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 7cb4ea0..456d241 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -54,7 +54,8 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=sha,prefix=sha- - type=raw,value=latest,enable=${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) }} + type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }} + type=raw,value=stable,enable=${{ startsWith(github.ref, 'refs/tags/v') }} - name: Determine image version id: version @@ -63,7 +64,7 @@ jobs: if [[ "$GITHUB_REF" == refs/tags/v* ]]; then version="$GITHUB_REF_NAME" else - version="$(git describe --tags --abbrev=0 2>/dev/null || git rev-parse --short=12 HEAD)" + version="$(git describe --tags --always --dirty 2>/dev/null || git rev-parse --short=12 HEAD)" fi echo "version=$version" >> "$GITHUB_OUTPUT" diff --git a/README.md b/README.md index 1f34f15..7db91b0 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ mkdir -p video-site-91 && cd video-site-91 ```yaml services: video-site-91: - image: ghcr.io/nianzhibai/91:latest + image: ghcr.io/nianzhibai/91:stable container_name: video-site-91 ports: - "9191:9191" @@ -122,6 +122,20 @@ services: restart: unless-stopped ``` +`stable` 只会在发布 `v*` 正式 Release 时更新,不会跟随 `main` 分支开发镜像变化。 +升级到最新正式版: + +```bash +docker compose pull +docker compose up -d +``` + +如果想固定某个 Release 版本,可以改成明确的 tag,例如: + +```yaml +image: ghcr.io/nianzhibai/91:v0.0.4 +``` + 或直接拉取仓库内置配置: ```bash @@ -138,7 +152,7 @@ docker compose up -d ```bash docker compose logs -f # 查看日志 -docker compose pull # 拉取最新镜像 +docker compose pull # 拉取最新正式版 stable 镜像 docker compose up -d # 更新并重启 ``` diff --git a/docker-compose.yml b/docker-compose.yml index 3d5b7af..7db2494 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: video-site-91: - image: ghcr.io/nianzhibai/91:latest + image: ghcr.io/nianzhibai/91:stable container_name: video-site-91 ports: - "9191:9191"