Skip to content

chore(upstream-sync): 2026-04-30 pull from router-for-me/CLIProxyAPI#6

Merged
leic4u merged 3 commits into
mainfrom
upstream-sync/20260430-0407
Apr 30, 2026
Merged

chore(upstream-sync): 2026-04-30 pull from router-for-me/CLIProxyAPI#6
leic4u merged 3 commits into
mainfrom
upstream-sync/20260430-0407

Conversation

@github-actions
Copy link
Copy Markdown

Upstream sync: router-for-me/CLIProxyAPImain

Commits being synced: 359ec30d0c5674659d9d73080de378f9a7417c4a..e3e60f914ba82a6caa7a17a717f65a3b2f02285f

Gate status

  • [!] go test FAILED

What to do

  1. Review the diff — especially cmd/server/main.go, go.mod, go.sum.
  2. Plus-only provider dirs are protected by .gitattributes merge=ours.
  3. Re-run failing gates locally: go build ./... && go test ./....
  4. Merge when green.

luispater and others added 3 commits April 30, 2026 03:42
- Added `disable-image-generation` configuration flag to disable the `image_generation` tool globally.
- Updated payload handling to remove `image_generation` tools from request payload arrays when the flag is enabled.
- Modified OpenAI image handlers (`ImagesGenerations`, `ImagesEdits`) to return 404 when the feature is disabled.
- Enhanced configuration diff logging to track changes for the `disable-image-generation` flag.
- Added accompanying unit tests for the new feature in payload helpers and image handler logic.
@leic4u leic4u merged commit d49d918 into main Apr 30, 2026
@leic4u leic4u deleted the upstream-sync/20260430-0407 branch April 30, 2026 17:57
leic4u pushed a commit that referenced this pull request May 1, 2026
…om sync-release-tag

Resolves #6.

The previous docker-image.yml never produced a published image:
  1. It triggered on `push: tags: v*`, but sync-release-tag.yml pushes
     tags using GITHUB_TOKEN, and GITHUB_TOKEN tag-pushes do NOT cascade
     to other workflows.
  2. The single time it ran (manually, 2026-04-22) it failed — likely
     missing DOCKERHUB_USERNAME / DOCKERHUB_TOKEN secrets.

Changes:

docker-image.yml
- Single multi-arch job using QEMU + buildx instead of three jobs
  (amd64 / arm64 / manifest stitching).
- Runs on self-hosted `cliproxy` runner (docker host LXC) — no charge,
  no GitHub-hosted minutes.
- Pushes to ghcr.io/${owner}/cli-proxy-api-plus using the built-in
  GITHUB_TOKEN. No Docker Hub secrets to manage or rotate.
- Tags published: :${VERSION}, :latest. Single multi-arch manifest
  per tag (no -amd64/-arm64 suffix tags or post-build cleanup).
- workflow_dispatch accepts an optional `tag` input; the build checks
  out that ref before building. This is what sync-release-tag.yml
  invokes.

sync-release-tag.yml
- After creating (or detecting) a fork tag, explicitly dispatch BOTH
  release.yaml and docker-image.yml with the tag. Mirrors the existing
  pattern for release.yaml. Each dispatch is best-effort (`|| true`)
  so a transient failure in one does not block the other.
leic4u pushed a commit that referenced this pull request May 1, 2026
Closing #6 yesterday claimed the image was published, but `docker compose
up` still 404'd because docker-compose.yml defaulted to
`eceasy/cli-proxy-api-plus:latest` — an image that has never existed
anywhere (eceasy publishes `cli-proxy-api`, not `-plus`; Plus's old
DOCKERHUB_USERNAME workflow never ran successfully). Reported by
@simonsmh in #6.

Changes:
- docker-compose.yml: default image is now
  ghcr.io/kaitranntt/cli-proxy-api-plus:latest, matching what PR #44
  publishes. Users can still override via CLI_PROXY_IMAGE.
- .gitattributes: add `docker-compose.yml merge=ours` so the next
  upstream sync does not silently revert this image path back to
  upstream's `eceasy/cli-proxy-api:latest`. Image references are the
  only Plus-specific bit of the compose file; if upstream evolves the
  rest, we reconcile manually rather than letting auto-merge bring back
  a broken default.
- README.md: add a "Run with Docker" subsection under Getting Started
  with the GHCR pull commands and a docker-compose snippet, so users
  can find install instructions without grepping closed issues.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants