From ce28428749b71e6172a3dd70e7c87450a3d57508 Mon Sep 17 00:00:00 2001 From: Franz Haberfellner Date: Tue, 10 Nov 2026 20:36:06 +0100 Subject: [PATCH 1/2] fix(ci): fix DockerHub semver tagging and coordinate MCP Registry publish (#138) --- .github/workflows/publish-dockerhub.yml | 1 + .github/workflows/publish-mcp.yml | 19 +++++++++++++++++++ CHANGELOG.md | 6 ++++++ docker/Dockerfile | 2 +- docs/releases.md | 4 ++++ pyproject.toml | 2 +- server.json | 4 ++-- uv.lock | 2 +- 8 files changed, 35 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-dockerhub.yml b/.github/workflows/publish-dockerhub.yml index 057c138..5259eb6 100644 --- a/.github/workflows/publish-dockerhub.yml +++ b/.github/workflows/publish-dockerhub.yml @@ -60,6 +60,7 @@ jobs: tags: | type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }} type=ref,event=tag + type=semver,pattern={{version}} - name: Build and publish image uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0 diff --git a/.github/workflows/publish-mcp.yml b/.github/workflows/publish-mcp.yml index b29cb7a..cc1206b 100644 --- a/.github/workflows/publish-mcp.yml +++ b/.github/workflows/publish-mcp.yml @@ -55,6 +55,25 @@ jobs: - name: Validate server.json run: ./mcp-publisher validate server.json + - name: Wait for OCI image to become available in registry + run: | + IMAGE=$(jq -r '.packages[0].identifier' server.json) + echo "Checking registry for OCI image $IMAGE..." + FOUND=false + for i in {1..30}; do + if docker manifest inspect "$IMAGE" >/dev/null 2>&1; then + echo "✅ $IMAGE is available in the container registry." + FOUND=true + break + fi + echo "Attempt $i/30: $IMAGE not yet found in registry, waiting 15s..." + sleep 15 + done + if [ "$FOUND" != "true" ]; then + echo "❌ Timed out waiting for $IMAGE in registry." + exit 1 + fi + - name: Authenticate with MCP Registry via GitHub OIDC run: ./mcp-publisher login github-oidc diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a8ada5..d67114d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.7.3] — 2026-11-10 + +### Fixed +- **ci**: Add SemVer `type=semver,pattern={{version}}` tagging to Docker Hub publishing workflow (#138) +- **ci**: Coordinate MCP Registry publish workflow to wait for OCI container image availability on Docker Hub (#138) + ## [2.7.2] — 2026-11-10 ### Added diff --git a/docker/Dockerfile b/docker/Dockerfile index 49b4792..248261f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ ARG PYTHON_VERSION=3.14 LABEL org.opencontainers.image.title="torproxy" \ org.opencontainers.image.description="A minimal HTTP proxy routed through Tor" \ - org.opencontainers.image.version="2.7.2" \ + org.opencontainers.image.version="2.7.3" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.source="https://github.com/hapheus/torproxy" \ org.opencontainers.image.url="https://github.com/hapheus/torproxy" diff --git a/docs/releases.md b/docs/releases.md index 7762add..2f1801a 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -91,6 +91,10 @@ If an upgraded image exhibits unexpected behavior in your environment: ## 6. Release Notes +### 2.7.3 (DockerHub SemVer tagging and MCP Registry publish coordination) + +- **DockerHub Tagging & MCP Publish Coordination (#138):** Added `type=semver,pattern={{version}}` to `publish-dockerhub.yml` so Docker Hub receives both `X.Y.Z` and `vX.Y.Z` tags. Added synchronization in `publish-mcp.yml` to wait for the target OCI container image to be verified on Docker Hub before publishing `server.json` to `registry.modelcontextprotocol.io`. + ### 2.7.2 (MCP Registry automated publishing workflow) - **Automated MCP Registry Publish (#134, #135):** Added `.github/workflows/publish-mcp.yml` using GitHub Actions OIDC (`id-token: write`) to automatically publish the verified `server.json` to `registry.modelcontextprotocol.io` upon pushing release tags (`v*`). diff --git a/pyproject.toml b/pyproject.toml index c66bc57..34c9c70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "torproxy" -version = "2.7.2" +version = "2.7.3" description = "A minimal HTTP and SOCKS5 proxy routed through the Tor network with local REST control API" readme = "README.md" requires-python = ">=3.10" diff --git a/server.json b/server.json index fe09350..049bd68 100644 --- a/server.json +++ b/server.json @@ -3,7 +3,7 @@ "name": "io.github.hapheus/torproxy", "title": "torproxy", "description": "Tor HTTP and SOCKS5 proxy with REST API and built-in MCP server.", - "version": "2.7.2", + "version": "2.7.3", "repository": { "url": "https://github.com/hapheus/torproxy", "source": "github" @@ -11,7 +11,7 @@ "packages": [ { "registryType": "oci", - "identifier": "docker.io/hapheus/torproxy:2.7.2", + "identifier": "docker.io/hapheus/torproxy:2.7.3", "transport": { "type": "stdio" }, diff --git a/uv.lock b/uv.lock index 2e1e254..9a0f318 100644 --- a/uv.lock +++ b/uv.lock @@ -842,7 +842,7 @@ wheels = [ [[package]] name = "torproxy" -version = "2.7.2" +version = "2.7.3" source = { editable = "." } [package.optional-dependencies] From 0bd0db0430b6113976f97a3e1c42933881e516fb Mon Sep 17 00:00:00 2001 From: Franz Haberfellner Date: Tue, 10 Nov 2026 20:37:50 +0100 Subject: [PATCH 2/2] docs(changelog): add comparison link for 2.7.3 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d67114d..e7f4596 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -229,7 +229,8 @@ Sprint 1 security & contract correctness release. --- -[Unreleased]: https://github.com/hapheus/torproxy/compare/v2.7.2...HEAD +[Unreleased]: https://github.com/hapheus/torproxy/compare/v2.7.3...HEAD +[2.7.3]: https://github.com/hapheus/torproxy/compare/v2.7.2...v2.7.3 [2.7.2]: https://github.com/hapheus/torproxy/compare/v2.7.1...v2.7.2 [2.7.1]: https://github.com/hapheus/torproxy/compare/v2.7.0...v2.7.1 [2.7.0]: https://github.com/hapheus/torproxy/compare/v2.6.2...v2.7.0