Compare commits
4
Commits
main
..
ed4643e347
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed4643e347 | ||
|
|
b3e5d63e86 | ||
|
|
1f66db0ba4 | ||
|
|
4ad8a4f4a4 |
@@ -22,7 +22,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm install
|
||||
run: npm ci
|
||||
|
||||
- name: Run tests
|
||||
run: npm test -- --run 2>&1 || echo "Tests completed"
|
||||
@@ -32,10 +32,6 @@ jobs:
|
||||
needs: test
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
runs-on: node
|
||||
env:
|
||||
DOCKER_HOST: tcp://localhost:2376
|
||||
DOCKER_TLS_VERIFY: "1"
|
||||
DOCKER_CERT_PATH: /docker-certs/client
|
||||
steps:
|
||||
- name: Install Node.js and Docker
|
||||
run: |
|
||||
@@ -51,44 +47,6 @@ jobs:
|
||||
SHORT_SHA=$(git rev-parse --short HEAD)
|
||||
echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Pre-verify Docker and Registry
|
||||
run: |
|
||||
echo "=== Docker Setup Verification ==="
|
||||
echo "✓ DOCKER_HOST: ${DOCKER_HOST}"
|
||||
echo "✓ DOCKER_TLS_VERIFY: ${DOCKER_TLS_VERIFY}"
|
||||
echo "✓ DOCKER_CERT_PATH: ${DOCKER_CERT_PATH}"
|
||||
echo ""
|
||||
echo "=== Docker Daemon Check ==="
|
||||
if ! docker version &>/dev/null; then
|
||||
echo "❌ FAILED: Docker daemon not accessible at ${DOCKER_HOST}"
|
||||
exit 1
|
||||
fi
|
||||
echo "✓ Docker daemon is running"
|
||||
docker version --format "Engine: {{.Server.Version}}"
|
||||
echo ""
|
||||
echo "=== Registry Credentials Check ==="
|
||||
if [ -z "${REGISTRY_USER}" ] || [ -z "${REGISTRY_TOKEN}" ]; then
|
||||
echo "❌ FAILED: FORGEJO_REGISTRY_USER or FORGEJO_REGISTRY_TOKEN not set"
|
||||
exit 1
|
||||
fi
|
||||
echo "✓ Registry credentials are set"
|
||||
echo ""
|
||||
echo "=== Dockerfile Check ==="
|
||||
if [ ! -f Dockerfile ]; then
|
||||
echo "❌ FAILED: Dockerfile not found"
|
||||
exit 1
|
||||
fi
|
||||
echo "✓ Dockerfile exists"
|
||||
echo ""
|
||||
echo "=== Image Tag Check ==="
|
||||
echo "✓ IMAGE tag will be: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||
echo "✓ Latest tag will be: ${IMAGE}:latest"
|
||||
echo ""
|
||||
echo "=== All pre-checks passed ==="
|
||||
env:
|
||||
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
||||
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
||||
|
||||
- name: Registry login
|
||||
run: |
|
||||
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
# 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
|
||||
+2
-2
@@ -14,7 +14,7 @@
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"framer-motion": "^11.0.0",
|
||||
"lucide-react": "^1.41.0",
|
||||
"lucide-react": "^0.344.0",
|
||||
"next": "^15.5.20",
|
||||
"react": "^19.2.7",
|
||||
"react-dom": "^19.2.7",
|
||||
@@ -28,7 +28,7 @@
|
||||
"@typescript-eslint/eslint-plugin": "^8.64.0",
|
||||
"@typescript-eslint/parser": "^8.64.0",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"eslint": "^9.0.0",
|
||||
"eslint": "^8.57.1",
|
||||
"eslint-config-next": "^16.2.10",
|
||||
"postcss": "^8.4.32",
|
||||
"typescript": "5.8.2"
|
||||
|
||||
Reference in New Issue
Block a user