@panoptic-it-solutions/coolify-setup 1.1.40 → 1.1.41
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/templates/claude-rules.js +33 -10
- package/package.json +1 -1
|
@@ -20,30 +20,53 @@ This project uses a trunk-based development workflow with deployment branches:
|
|
|
20
20
|
| \`staging\` | Staging environment deployment | Staging server |
|
|
21
21
|
| \`main\` | Production environment deployment | Production server |
|
|
22
22
|
|
|
23
|
+
### Starting Work (IMPORTANT)
|
|
24
|
+
|
|
25
|
+
**Before starting any work, you MUST:**
|
|
26
|
+
|
|
27
|
+
1. Pull the latest \`develop\` branch:
|
|
28
|
+
\`\`\`bash
|
|
29
|
+
git checkout develop
|
|
30
|
+
git pull origin develop
|
|
31
|
+
\`\`\`
|
|
32
|
+
|
|
33
|
+
2. Create a new branch from \`develop\`:
|
|
34
|
+
\`\`\`bash
|
|
35
|
+
# For new features
|
|
36
|
+
git checkout -b feature/feature-name
|
|
37
|
+
|
|
38
|
+
# For bug fixes
|
|
39
|
+
git checkout -b fix/bug-description
|
|
40
|
+
|
|
41
|
+
# For urgent production fixes
|
|
42
|
+
git checkout -b hotfix/urgent-fix
|
|
43
|
+
\`\`\`
|
|
44
|
+
|
|
45
|
+
**NEVER work directly on \`develop\`, \`staging\`, or \`main\` branches.**
|
|
46
|
+
|
|
23
47
|
### Workflow
|
|
24
48
|
|
|
25
|
-
1. **Development**: Create branches from \`develop\`
|
|
26
|
-
- Features: \`feature/feature-name\`
|
|
27
|
-
- Fixes: \`fix/bug-description\`
|
|
28
|
-
- Hotfixes: \`hotfix/urgent-fix\`
|
|
49
|
+
1. **Development**: Create branches from \`develop\` (see above)
|
|
29
50
|
|
|
30
51
|
2. **Feature Development**: Push feature/fix/hotfix branches
|
|
31
|
-
- Builds Docker image
|
|
32
|
-
- Pushes to private registry
|
|
52
|
+
- Builds Docker image (verification only)
|
|
33
53
|
- Creates PR to \`develop\` branch
|
|
34
54
|
|
|
35
55
|
3. **Integration**: Merge PR to \`develop\`
|
|
36
|
-
- Builds Docker image
|
|
56
|
+
- Builds Docker image (verification only)
|
|
37
57
|
- Creates PR to \`staging\` branch
|
|
38
58
|
|
|
39
59
|
4. **Staging Deployment**: Merge PR to \`staging\`
|
|
60
|
+
- Bumps version based on conventional commits
|
|
61
|
+
- Commits \`chore(release): vX.X.X\`
|
|
62
|
+
- Creates \`staging-v*\` tag
|
|
63
|
+
- Builds and pushes Docker image to registry
|
|
40
64
|
- Coolify auto-deploys to staging server
|
|
41
|
-
- GitHub Actions runs semantic versioning workflow
|
|
42
|
-
- Creates \`staging-v*\` tags based on conventional commits
|
|
43
65
|
- Creates PR to \`main\` branch
|
|
44
|
-
-
|
|
66
|
+
- Creates sync PR to \`develop\` (auto-merges)
|
|
45
67
|
|
|
46
68
|
5. **Production Deployment**: Merge PR to \`main\`
|
|
69
|
+
- Creates production tag (\`vX.X.X\`)
|
|
47
70
|
- Coolify auto-deploys to production server
|
|
48
71
|
|
|
49
72
|
### Conventional Commits
|