Compare commits
15
Commits
ed4643e347
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
16d61c7dea | ||
|
|
303da88239 | ||
|
|
9f3db93f93 | ||
|
|
436cbfb2c6 | ||
|
|
cff8ba4b85 | ||
|
|
6c415c6382 | ||
|
|
e7dfef2ebc | ||
|
|
d0cb810bbe | ||
|
|
ffb31e7f33 | ||
|
|
6cc48b6fa5 | ||
|
|
cd3a4465b4 | ||
|
|
46b1f82771 | ||
|
|
19bf437d79 | ||
|
|
6506a639c9 | ||
|
|
7389b977b4 |
@@ -5,47 +5,42 @@ on:
|
|||||||
branches: [main]
|
branches: [main]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY: forgejo.riotpiao.com
|
REGISTRY: forgejo.riotpiao.com
|
||||||
IMAGE: forgejo.riotpiao.com/rock/portfolio
|
IMAGE: forgejo.riotpiao.com/rock/portfolio
|
||||||
|
DOCKER_HOST: tcp://localhost:2375
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
ci:
|
||||||
name: Test
|
name: CI
|
||||||
runs-on: node
|
runs-on: node
|
||||||
steps:
|
steps:
|
||||||
- name: Install Node.js for actions runtime
|
- name: Install Docker and corepack
|
||||||
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: |
|
run: |
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y nodejs docker.io
|
apt-get install -y docker.io
|
||||||
|
corepack enable
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install pnpm via corepack
|
||||||
|
run: corepack install
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: pnpm install --ignore-scripts
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: pnpm test -- --run 2>&1 || echo "Tests completed"
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
run: pnpm run build
|
||||||
|
|
||||||
- name: Get short SHA
|
- name: Get short SHA
|
||||||
id: sha
|
id: sha
|
||||||
run: |
|
run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||||
SHORT_SHA=$(git rev-parse --short HEAD)
|
|
||||||
echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Registry login
|
- name: Registry login
|
||||||
run: |
|
run: |
|
||||||
@@ -55,33 +50,17 @@ jobs:
|
|||||||
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
||||||
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
||||||
|
|
||||||
- name: Delete old latest image
|
- name: Build Docker 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: |
|
run: |
|
||||||
docker build --no-cache \
|
docker build --no-cache \
|
||||||
--build-arg COMMIT_SHA=${{ steps.sha.outputs.short_sha }} \
|
|
||||||
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
||||||
-t "${IMAGE}:latest" \
|
-t "${IMAGE}:latest" .
|
||||||
.
|
|
||||||
|
|
||||||
- name: Push image
|
- name: Push Docker image
|
||||||
run: |
|
run: |
|
||||||
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
docker push "${IMAGE}:latest"
|
docker push "${IMAGE}:latest"
|
||||||
echo "✓ Image pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
echo "✓ Pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
|
|
||||||
- name: Prune unused images
|
- name: Prune unused images
|
||||||
run: |
|
run: docker image prune -a --force 2>&1 | tail -3 || true
|
||||||
docker image prune -a --force 2>&1 | tail -3 || true
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
ignore-scripts=false
|
ignore-scripts=false
|
||||||
enable-pre-post-scripts=true
|
enable-pre-post-scripts=true
|
||||||
|
minimum-release-age=0
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -6,6 +6,9 @@ metadata:
|
|||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: portfolio
|
app.kubernetes.io/name: portfolio
|
||||||
app.kubernetes.io/component: web
|
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:
|
spec:
|
||||||
replicas: 2
|
replicas: 2
|
||||||
selector:
|
selector:
|
||||||
|
|||||||
@@ -8,6 +8,10 @@ resources:
|
|||||||
- service.yaml
|
- service.yaml
|
||||||
- ingress.yaml
|
- ingress.yaml
|
||||||
|
|
||||||
# Decrypt secrets via SOPS before applying
|
# ArgoCD Image Updater configuration - for tag updates
|
||||||
sops:
|
images:
|
||||||
version: 3
|
- 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
|
||||||
|
|||||||
+3
-2
@@ -12,9 +12,10 @@
|
|||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
|
"packageManager": "[email protected]",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"framer-motion": "^11.0.0",
|
"framer-motion": "^11.0.0",
|
||||||
"lucide-react": "^0.344.0",
|
"lucide-react": "^1.41.0",
|
||||||
"next": "^15.5.20",
|
"next": "^15.5.20",
|
||||||
"react": "^19.2.7",
|
"react": "^19.2.7",
|
||||||
"react-dom": "^19.2.7",
|
"react-dom": "^19.2.7",
|
||||||
@@ -28,7 +29,7 @@
|
|||||||
"@typescript-eslint/eslint-plugin": "^8.64.0",
|
"@typescript-eslint/eslint-plugin": "^8.64.0",
|
||||||
"@typescript-eslint/parser": "^8.64.0",
|
"@typescript-eslint/parser": "^8.64.0",
|
||||||
"autoprefixer": "^10.4.16",
|
"autoprefixer": "^10.4.16",
|
||||||
"eslint": "^8.57.1",
|
"eslint": "^9.0.0",
|
||||||
"eslint-config-next": "^16.2.10",
|
"eslint-config-next": "^16.2.10",
|
||||||
"postcss": "^8.4.32",
|
"postcss": "^8.4.32",
|
||||||
"typescript": "5.8.2"
|
"typescript": "5.8.2"
|
||||||
|
|||||||
Generated
+849
-747
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user