Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed4643e347 | ||
|
|
b3e5d63e86 | ||
|
|
1f66db0ba4 | ||
|
|
4ad8a4f4a4 |
@@ -5,42 +5,47 @@ on:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
REGISTRY: forgejo.riotpiao.com
|
||||
IMAGE: forgejo.riotpiao.com/rock/portfolio
|
||||
DOCKER_HOST: tcp://localhost:2375
|
||||
|
||||
jobs:
|
||||
ci:
|
||||
name: CI
|
||||
test:
|
||||
name: Test
|
||||
runs-on: node
|
||||
steps:
|
||||
- name: Install Docker and corepack
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y docker.io
|
||||
corepack enable
|
||||
- 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 pnpm via corepack
|
||||
run: corepack install
|
||||
|
||||
- name: Install dependencies
|
||||
run: pnpm install --ignore-scripts
|
||||
run: npm ci
|
||||
|
||||
- name: Run tests
|
||||
run: pnpm test -- --run 2>&1 || echo "Tests completed"
|
||||
run: npm test -- --run 2>&1 || echo "Tests completed"
|
||||
|
||||
- name: Build
|
||||
run: pnpm run build
|
||||
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
|
||||
|
||||
- name: Get short SHA
|
||||
id: sha
|
||||
run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||
run: |
|
||||
SHORT_SHA=$(git rev-parse --short HEAD)
|
||||
echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Registry login
|
||||
run: |
|
||||
@@ -50,17 +55,33 @@ jobs:
|
||||
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
||||
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
||||
|
||||
- name: Build Docker image
|
||||
- name: Delete old latest image
|
||||
run: |
|
||||
# Delete old :latest tag from Forgejo registry via API
|
||||
curl -s -X DELETE \
|
||||
-u "${REGISTRY_USER}:${REGISTRY_TOKEN}" \
|
||||
"https://${REGISTRY}/v2/rock/portfolio/manifests/$(curl -s -H 'Accept: application/vnd.oci.image.index.v1+json' -u "${REGISTRY_USER}:${REGISTRY_TOKEN}" "https://${REGISTRY}/v2/rock/portfolio/manifests/latest" | head -1 | grep -o 'sha256:[a-f0-9]*' || true)" \
|
||||
2>/dev/null || echo "No old latest to delete"
|
||||
env:
|
||||
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
||||
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
||||
|
||||
- name: Build image
|
||||
run: |
|
||||
docker build --no-cache \
|
||||
--build-arg COMMIT_SHA=${{ steps.sha.outputs.short_sha }} \
|
||||
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
||||
-t "${IMAGE}:latest" .
|
||||
-t "${IMAGE}:latest" \
|
||||
.
|
||||
|
||||
- name: Push Docker image
|
||||
- name: Push image
|
||||
run: |
|
||||
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||
docker push "${IMAGE}:latest"
|
||||
echo "✓ Pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||
echo "✓ Image pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||
|
||||
- name: Prune unused images
|
||||
run: docker image prune -a --force 2>&1 | tail -3 || true
|
||||
run: |
|
||||
docker image prune -a --force 2>&1 | tail -3 || true
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
ignore-scripts=false
|
||||
enable-pre-post-scripts=true
|
||||
minimum-release-age=0
|
||||
|
||||
@@ -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
|
||||
@@ -6,9 +6,6 @@ metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: portfolio
|
||||
app.kubernetes.io/component: web
|
||||
annotations:
|
||||
argocd-image-updater.argoproj.io/image-list: portfolio=forgejo.riotpiao.com/rock/portfolio
|
||||
argocd-image-updater.argoproj.io/portfolio.update-strategy: latest
|
||||
spec:
|
||||
replicas: 2
|
||||
selector:
|
||||
|
||||
@@ -8,10 +8,6 @@ resources:
|
||||
- service.yaml
|
||||
- ingress.yaml
|
||||
|
||||
# ArgoCD Image Updater configuration - for tag updates
|
||||
images:
|
||||
- name: forgejo.riotpiao.com/rock/portfolio
|
||||
newTag: latest
|
||||
|
||||
# Note: SOPS decryption is handled by ArgoCD repo-server plugin,
|
||||
# not via kustomization.yaml, to allow Image Updater to parse this file
|
||||
# Decrypt secrets via SOPS before applying
|
||||
sops:
|
||||
version: 3
|
||||
|
||||
+2
-3
@@ -12,10 +12,9 @@
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"packageManager": "[email protected]",
|
||||
"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",
|
||||
@@ -29,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"
|
||||
|
||||
Generated
+747
-849
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user