From 1461abef2f82270e0f126668a6890be7f84ea07e Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 16 Jan 2026 22:22:33 +0000 Subject: [PATCH] issue: update 1beb - blocked on GitHub auth --- 1beb-deploy-ngit-relay-rate-limiting-fix.md | 36 ++++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/1beb-deploy-ngit-relay-rate-limiting-fix.md b/1beb-deploy-ngit-relay-rate-limiting-fix.md index 4dc93eb..05e67d2 100644 --- a/1beb-deploy-ngit-relay-rate-limiting-fix.md +++ b/1beb-deploy-ngit-relay-rate-limiting-fix.md @@ -11,8 +11,8 @@ The ngit-relay rate limiting fix (commit 81e35bb) is on branch `fix-rate-limitin - [x] Merge fix-rate-limiting to master in ngit-relay repo - [x] Build and tag Docker image as v0.0.4 - [ ] Push Docker image to GitHub Container Registry -- [ ] Update nixos-vps1 service configs to use v0.0.4 -- [ ] Commit nixos-vps1 config changes +- [x] Update nixos-vps1 service configs to use v0.0.4 +- [x] Commit nixos-vps1 config changes - [ ] Deploy to VPS using deploy command - [ ] Verify deployment (containers running v0.0.4, reduced 429 errors) - [ ] Push ngit-relay master branch to remote @@ -23,8 +23,12 @@ The ngit-relay rate limiting fix (commit 81e35bb) is on branch `fix-rate-limitin - Started: Created issue to track deployment workflow - Created worktree for deployment work - Completed: Merged fix-rate-limiting to master (fast-forward) -- Completed: Built Docker image v0.0.4 and tagged as latest +- Completed: Built Docker image v0.0.4 and tagged as latest locally - Blocker: Docker push failed - authentication required for ghcr.io +- Completed: Created v0.0.4 tag locally +- Blocker: Git push to GitHub failed - nostr:// origin causes timeouts, GitHub remote requires auth +- Completed: Updated nixos-vps1 configs for both services (commit a7fbcd7) +- Next: Manual push of master + v0.0.4 tag to GitHub required to trigger Action ## Notes @@ -33,17 +37,33 @@ The ngit-relay rate limiting fix (commit 81e35bb) is on branch `fix-rate-limitin - Services affected: gitnostr-com-ngit-relay, relay-ngit-dev-ngit-relay - VPS: 94.156.119.146 -### Docker Authentication Required +### Manual Steps Required -To complete the Docker push manually: +The deployment is blocked on pushing to GitHub. Two options: +**Option 1: Push to GitHub (Recommended - triggers GitHub Action)** +```bash +cd /persistent/dcdev/clones/ngit-relay +# Add GitHub remote if not exists +git remote add github https://github.com/danconwaydev/ngit-relay.git +# Push master and tag (requires GitHub authentication) +git push github master +git push github v0.0.4 +``` +This will trigger the GitHub Action to build and push the Docker image automatically. + +**Option 2: Manual Docker Push** ```bash # Login to GitHub Container Registry echo $GITHUB_TOKEN | docker login ghcr.io -u danconwaydev --password-stdin - -# Push images +# Push locally built images docker push ghcr.io/danconwaydev/ngit-relay:v0.0.4 docker push ghcr.io/danconwaydev/ngit-relay:latest ``` -Alternatively, the GitHub Action workflow may handle this automatically on push to master. +**After Docker image is available:** +```bash +cd /persistent/dcdev/clones/nixos-vps1 +# Deploy to VPS (configs already updated and committed) +deploy . +```