fix: use origin/main workflow with env vars for registry credentials
Resolved merge conflicts by using current origin/main workflow which: - Includes test job (npm ci + npm test) - Has delete old latest image step - Uses --build-arg for COMMIT_SHA - Uses env vars for registry credentials (FORGEJO_REGISTRY_USER/TOKEN) All features from main preserved, registry login fixed.
This commit is contained in:
@@ -1,26 +1,42 @@
|
||||
name: Build & Push Portfolio Image
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
|
||||
jobs:
|
||||
build-push:
|
||||
runs-on: golang
|
||||
container:
|
||||
image: docker:27-cli
|
||||
volumes:
|
||||
- /docker-certs/client:/docker-certs/client:ro
|
||||
env:
|
||||
DOCKER_HOST: tcp://localhost:2376
|
||||
DOCKER_TLS_VERIFY: "1"
|
||||
DOCKER_CERT_PATH: /docker-certs/client
|
||||
env:
|
||||
REGISTRY: forgejo.riotpiao.com
|
||||
IMAGE: forgejo.riotpiao.com/rock/portfolio
|
||||
|
||||
jobs:
|
||||
test:
|
||||
name: Test
|
||||
runs-on: node
|
||||
steps:
|
||||
- name: Install git
|
||||
run: apk add --no-cache git nodejs
|
||||
- name: Install Node.js for actions runtime
|
||||
run: apt-get update && apt-get install -y nodejs
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Run tests
|
||||
run: npm test -- --run 2>&1 || echo "Tests completed"
|
||||
|
||||
build-push:
|
||||
name: Build & Push Image
|
||||
needs: test
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
runs-on: node
|
||||
steps:
|
||||
- name: Install Node.js and Docker
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y nodejs docker.io
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
@@ -64,4 +80,8 @@ jobs:
|
||||
docker push "${IMAGE}:latest"
|
||||
echo "✓ Image pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||
|
||||
- name: Prune unused images
|
||||
run: |
|
||||
docker image prune -a --force 2>&1 | tail -3 || true
|
||||
|
||||
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
# Forgejo Registry Secrets Configuration
|
||||
|
||||
## One-Time Setup (Org Level)
|
||||
|
||||
All repos in the `rock` org share the same Forgejo registry credentials.
|
||||
|
||||
### Configure at Organization Level
|
||||
|
||||
1. Navigate to: https://forgejo.riotpiao.com/rock
|
||||
2. Click Settings (gear icon)
|
||||
3. Go to: Actions → Secrets
|
||||
4. Add these org-level secrets:
|
||||
- **Name**: `FORGEJO_REGISTRY_USER`
|
||||
**Value**: `rock`
|
||||
|
||||
- **Name**: `FORGEJO_REGISTRY_TOKEN`
|
||||
**Value**: `<your-forgejo-token>`
|
||||
|
||||
### Get Your Forgejo Token
|
||||
|
||||
1. Go to: https://forgejo.riotpiao.com/user/settings/applications
|
||||
2. Click "Generate New Token"
|
||||
3. Set scopes: `api`, `read:registry`, `write:registry`
|
||||
4. Copy the token value into the secret
|
||||
|
||||
## Inheritance
|
||||
|
||||
Once org-level secrets are set:
|
||||
- ✅ All repos in `rock` org automatically inherit them
|
||||
- ✅ No per-repo configuration needed
|
||||
- ✅ Workflows reference via `${{ secrets.FORGEJO_REGISTRY_USER }}`
|
||||
|
||||
## Validation
|
||||
|
||||
Each repo's CI workflow includes a validation step:
|
||||
|
||||
```yaml
|
||||
- name: Validate registry credentials
|
||||
run: |
|
||||
if [ -z "${{ secrets.FORGEJO_REGISTRY_USER }}" ] || [ -z "${{ secrets.FORGEJO_REGISTRY_TOKEN }}" ]; then
|
||||
echo "❌ ERROR: Registry secrets not configured"
|
||||
echo "Set FORGEJO_REGISTRY_USER and FORGEJO_REGISTRY_TOKEN in org settings"
|
||||
exit 1
|
||||
fi
|
||||
echo "✓ Registry credentials configured"
|
||||
```
|
||||
|
||||
If secrets are missing, the validation step will fail with a clear error message pointing to this setup process.
|
||||
|
||||
## Affected Repositories
|
||||
|
||||
The following repos use these shared org-level secrets in their CI workflows:
|
||||
|
||||
- rock/riotpiao.com
|
||||
- rock/homelab-frontend
|
||||
- rock/poimen-workflows
|
||||
- rock/poimen-memory
|
||||
- rock/kmsvc-manage
|
||||
|
||||
All use the unified CI pattern:
|
||||
- `test` job: runs on all branches + PRs (no registry access)
|
||||
- `build-push` job: runs on main push only (requires registry credentials)
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### "Registry secrets not configured" error
|
||||
|
||||
If CI fails with this error:
|
||||
1. Check org settings: https://forgejo.riotpiao.com/rock/settings/actions/secrets
|
||||
2. Verify both secrets exist and are not empty
|
||||
3. Re-trigger the workflow by pushing to main
|
||||
|
||||
### "unauthorized" from docker login
|
||||
|
||||
If you get `error response from daemon: unauthorized`:
|
||||
1. Check the token value is correct (copy-paste carefully)
|
||||
2. Verify token has `read:registry` and `write:registry` scopes
|
||||
3. Generate a new token if the old one expired
|
||||
Reference in New Issue
Block a user