@panoptic-it-solutions/coolify-setup 1.1.20 → 1.1.22

package/dist/git.js

@@ -84,7 +84,13 @@ export async function commitAndPushToDevelop(files) {
     try {
         const currentBranch = run('git branch --show-current');
         if (currentBranch === 'develop') {
-            // Already on develop, just push
+            // Pull latest changes with rebase, then push
+            try {
+                run('git pull --rebase origin develop');
+            }
+            catch {
+                // Pull might fail if remote doesn't exist yet, that's ok
+            }
             run('git push origin develop');
         }
         else {
@@ -93,6 +99,7 @@ export async function commitAndPushToDevelop(files) {
                 run('git fetch origin develop');
                 // Develop exists, checkout and merge/rebase current changes
                 run('git checkout develop');
+                run('git pull --rebase origin develop');
                 run(`git merge ${currentBranch} --no-edit`);
                 run('git push origin develop');
             }

package/dist/index.js

@@ -171,10 +171,35 @@ async function main() {
         console.log(chalk.yellow('  You may need to manually commit and push the generated files'));
     }
     console.log(chalk.bold.green('\n✅ Setup complete!\n'));
-    console.log('Next steps:');
-    console.log(chalk.cyan('  1. Review the generated files'));
-    console.log(chalk.cyan('  2. Update .env with your secrets'));
-    console.log(chalk.cyan('  3. Configure Coolify to deploy from staging branch\n'));
+    console.log(chalk.bold('Coolify Setup Instructions:\n'));
+    console.log(chalk.cyan.bold('1. Create Staging Environment'));
+    console.log('   • Server: panoptic-staging-server-1');
+    console.log(`   • Name: ${response.projectName}:staging`);
+    console.log('   • Build Pack: Docker Compose');
+    console.log('   • Compose file: change /docker-compose.yaml → /docker-compose.yml');
+    console.log('   • Branch: staging');
+    console.log(`   • Domain: https://${response.projectName}.staging.panoptic.tools\n`);
+    console.log(chalk.cyan.bold('2. Create Production Environment'));
+    console.log('   • Server: localhost');
+    console.log(`   • Name: ${response.projectName}:prod`);
+    console.log('   • Build Pack: Docker Compose');
+    console.log('   • Compose file: change /docker-compose.yaml → /docker-compose.yml');
+    console.log('   • Branch: main');
+    console.log(`   • Domain: https://${response.projectName}.panoptic.tools\n`);
+    console.log(chalk.cyan.bold('3. For Each Environment'));
+    console.log('   • Add environment variables in Coolify');
+    console.log('   • Generate domain (replace random string with app name)');
+    console.log('   • Deploy\n');
+    console.log(chalk.bold('Branching Strategy:\n'));
+    console.log('   develop     → Default branch, main development');
+    console.log('   feature/**  → New features');
+    console.log('   fix/**      → Bug fixes');
+    console.log('   hotfix/**   → Urgent fixes');
+    console.log('   staging     → Staging deployment (auto-deploy on merge)');
+    console.log('   main        → Production deployment (merge PR to deploy)\n');
+    console.log(chalk.bold('Deployment Flow:\n'));
+    console.log('   develop/feature/** → build → PR to staging → merge → staging deploys');
+    console.log('                                             → PR to main → merge → prod deploys\n');
 }
 main().catch((error) => {
     console.error(chalk.red('Error:'), error);

package/dist/templates/claude-rules.js

@@ -5,6 +5,83 @@ export function generateClaudeRules() {
 
 This project uses Coolify for deployment. Coolify has specific behaviors that require careful handling of Docker Compose configurations.
 
+## Branching Strategy
+
+This project uses a trunk-based development workflow with deployment branches:
+
+### Branch Types
+
+| Branch | Purpose | Deploys To |
+|--------|---------|------------|
+| \`develop\` | Default branch, main development | - |
+| \`feature/**\` | New features (e.g., \`feature/user-auth\`) | - |
+| \`fix/**\` | Bug fixes (e.g., \`fix/login-error\`) | - |
+| \`hotfix/**\` | Urgent production fixes | - |
+| \`staging\` | Staging environment deployment | Staging server |
+| \`main\` | Production environment deployment | Production server |
+
+### Workflow
+
+1. **Development**: Create branches from \`develop\`
+   - Features: \`feature/feature-name\`
+   - Fixes: \`fix/bug-description\`
+   - Hotfixes: \`hotfix/urgent-fix\`
+
+2. **Build**: Push triggers GitHub Actions
+   - Builds Docker image
+   - Pushes to private registry
+   - Creates PR to \`staging\` branch
+
+3. **Staging Deployment**: Merge PR to \`staging\`
+   - Coolify auto-deploys to staging server
+   - GitHub Actions creates PR to \`main\`
+   - Test changes in staging environment
+
+4. **Production Deployment**: Merge PR to \`main\`
+   - Coolify auto-deploys to production server
+
+### Branch Protection Rules
+
+- \`develop\` is the default branch
+- Direct pushes to \`staging\` and \`main\` should be avoided
+- All changes go through PRs for traceability
+
+## Coolify Setup Instructions
+
+### Creating Projects in Coolify
+
+Create two projects using GitHub private repo integration:
+
+#### Staging Environment
+- **Server:** panoptic-staging-server-1
+- **Name:** \`app-name:staging\`
+- **Build Pack:** Docker Compose
+- **Compose File:** Change from \`/docker-compose.yaml\` to \`/docker-compose.yml\`
+- **Branch:** staging
+- **Domain:** Generate, then replace random string with app name
+  - Example: \`https://app-name.staging.panoptic.tools\`
+
+#### Production Environment
+- **Server:** localhost
+- **Name:** \`app-name:prod\`
+- **Build Pack:** Docker Compose
+- **Compose File:** Change from \`/docker-compose.yaml\` to \`/docker-compose.yml\`
+- **Branch:** main
+- **Domain:** Generate, then replace random string with app name
+  - Example: \`https://app-name.panoptic.tools\`
+
+### Configuration Steps
+
+1. Create new project in Coolify
+2. Select "GitHub Private Repository"
+3. Choose the repository
+4. Set build pack to "Docker Compose"
+5. Change compose file path from \`/docker-compose.yaml\` to \`/docker-compose.yml\`
+6. Continue to add environment variables
+7. In the GitSource tab, select the correct branch (staging/main)
+8. Generate domain and replace random string with app name
+9. Deploy
+
 ## Critical Coolify Behaviors
 
 ### 1. Helper Container Architecture

package/dist/templates/workflow.js

@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - develop
+      - staging
       - 'feature/**'
       - 'fix/**'
       - 'hotfix/**'
@@ -50,28 +51,81 @@ jobs:
           echo "branch=staging" >> $GITHUB_OUTPUT
 
       - name: Create deploy PR
-        env:
-          GH_TOKEN: \${{ secrets.GITHUB_TOKEN }}
-        run: |
-          TARGET_BRANCH=\${{ steps.target.outputs.branch }}
-          SOURCE_BRANCH=\${{ github.ref_name }}
-
-          # Check if PR already exists
-          EXISTING_PR=\$(gh pr list --head "\$SOURCE_BRANCH" --base "\$TARGET_BRANCH" --json number -q '.[0].number' || echo "")
-
-          if [ -n "\$EXISTING_PR" ]; then
-            echo "PR #\$EXISTING_PR already exists for \$SOURCE_BRANCH -> \$TARGET_BRANCH"
-          else
-            gh pr create \\
-              --title "Deploy: \$SOURCE_BRANCH -> \$TARGET_BRANCH" \\
-              --body "Automated deployment PR from \$SOURCE_BRANCH to \$TARGET_BRANCH.
-
-              **Commit:** \${{ steps.sha.outputs.sha }}
-              **Image:** \${{ env.REGISTRY }}/\${{ env.PROJECT_NAME }}-app:\${{ steps.sha.outputs.sha }}
-
-              Merge this PR to trigger deployment." \\
-              --base "\$TARGET_BRANCH" \\
-              --head "\$SOURCE_BRANCH" || echo "PR creation skipped (may already exist or no changes)"
-          fi
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const targetBranch = '\${{ steps.target.outputs.branch }}';
+            const sourceBranch = '\${{ github.ref_name }}';
+
+            // Check if PR already exists
+            const { data: prs } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              head: \`\${context.repo.owner}:\${sourceBranch}\`,
+              base: targetBranch,
+              state: 'open'
+            });
+
+            if (prs.length > 0) {
+              console.log(\`PR #\${prs[0].number} already exists for \${sourceBranch} -> \${targetBranch}\`);
+              return;
+            }
+
+            try {
+              const { data: pr } = await github.rest.pulls.create({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: \`Deploy: \${sourceBranch} -> \${targetBranch}\`,
+                body: \`Automated deployment PR from \${sourceBranch} to \${targetBranch}.
+
+**Commit:** \${{ steps.sha.outputs.sha }}
+**Image:** \${{ env.REGISTRY }}/\${{ env.PROJECT_NAME }}-app:\${{ steps.sha.outputs.sha }}
+
+Merge this PR to trigger deployment.\`,
+                head: sourceBranch,
+                base: targetBranch
+              });
+              console.log(\`Created PR #\${pr.number}\`);
+            } catch (error) {
+              console.log(\`PR creation skipped: \${error.message}\`);
+            }
+
+      - name: Create production PR
+        if: github.ref == 'refs/heads/staging'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            // Check if PR already exists
+            const { data: prs } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              head: \`\${context.repo.owner}:staging\`,
+              base: 'main',
+              state: 'open'
+            });
+
+            if (prs.length > 0) {
+              console.log(\`PR #\${prs[0].number} already exists for staging -> main\`);
+              return;
+            }
+
+            try {
+              const { data: pr } = await github.rest.pulls.create({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: 'Deploy to Production: staging -> main',
+                body: \`Promote staging to production.
+
+**Commit:** \${{ steps.sha.outputs.sha }}
+**Image:** \${{ env.REGISTRY }}/\${{ env.PROJECT_NAME }}-app:\${{ steps.sha.outputs.sha }}
+
+Merge this PR to deploy to production.\`,
+                head: 'staging',
+                base: 'main'
+              });
+              console.log(\`Created PR #\${pr.number}\`);
+            } catch (error) {
+              console.log(\`PR creation skipped: \${error.message}\`);
+            }
 `;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoptic-it-solutions/coolify-setup",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",