Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
FIREBASE_CREDENTIALS_BASE64=${{ secrets.DEV_FIREBASE_CREDENTIALS_BASE64 }}
EOF

echo "${{ secrets.GHCR_READ_TOKEN }}" | sudo docker login ghcr.io -u "${{ secrets.GHCR_USERNAME }}" --password-stdin
echo "${{ secrets.GITHUB_TOKEN }}" | sudo docker login ghcr.io -u "${{ github.actor }}" --password-stdin

if sudo docker compose version >/dev/null 2>&1; then
COMPOSE="sudo docker compose"
Expand Down
4 changes: 2 additions & 2 deletions docs/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ Required development secrets:
- `DEV_REMOTE_HOST`
- `DEV_REMOTE_USER`
- `DEV_REMOTE_SSH_KEY`
- `GHCR_USERNAME`
- `GHCR_READ_TOKEN`

The development workflow uses the run-scoped `GITHUB_TOKEN` to pull the image from GHCR on the remote PC, so no long-lived GHCR read token is required for development deploys.

Optional development secrets:

Expand Down
4 changes: 1 addition & 3 deletions docs/git-workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,9 @@ Development deploy should use development secrets only:
DEV_REMOTE_HOST
DEV_REMOTE_USER
DEV_REMOTE_SSH_KEY
GHCR_USERNAME
GHCR_READ_TOKEN
```

Optional `DEV_*` secrets can override the default dev deploy directory, HTTP port, MySQL credentials, and non-production OAuth/Firebase settings.
The development deploy uses the workflow `GITHUB_TOKEN` for GHCR image pulls. Optional `DEV_*` secrets can override the default dev deploy directory, HTTP port, MySQL credentials, and non-production OAuth/Firebase settings.

## Branch Protection

Expand Down
Loading