diff --git a/README.md b/README.md index e972c2e..707488b 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ docker compose build # server image docker build --target client -t tunnel-client . # client image ``` -Release to GitHub + GHCR (multi-arch): `./ship.sh "your message"`. Every run **`docker login ghcr.io`** using **`gh api user`** and **`gh auth token`** (needs **`write:packages`** on that token), then **always** multi-arch **push**. **`git remote`** (default `github`, or `git config ship.remote`) must be **github.com** unless `ship.registryBase` is set. Optional: `ship.registryBase`, `ship.tagServer`, `ship.tagClient`, `ship.platforms`, `ship.buildxBuilder`. +Release to GitHub + GHCR (multi-arch): `./ship.sh "your message"`. **Does not run `docker login`** — use credentials you already configured (`docker login ghcr.io`, credential helper, etc.), then ship **buildx push** + **git push**. **`git remote`** (default `github`, or `git config ship.remote`) must be **github.com** unless `ship.registryBase` is set. Optional: `ship.registryBase`, `ship.tagServer`, `ship.tagClient`, `ship.platforms`, `ship.buildxBuilder`. ## Binaries and systemd (bare metal) diff --git a/ship.sh b/ship.sh index d62fc89..766c4da 100755 --- a/ship.sh +++ b/ship.sh @@ -159,7 +159,7 @@ CLIENT_TAG="${REGISTRY_BASE}:${TAG_CLIENT}" push_multi server "$SERVER_TAG" "$BUILDER" push_multi client "$CLIENT_TAG" "$BUILDER" -echo "==> [6/6] git push ${GIT_REMOTE} ${BRANCH}" +echo "==> [5/5] git push ${GIT_REMOTE} ${BRANCH}" git push "$GIT_REMOTE" "$BRANCH" echo "ship: ok commit=${GIT_COMMIT}"