@panoptic-it-solutions/coolify-setup 1.1.34 → 1.1.36

package/dist/generator.js

@@ -19,6 +19,65 @@ function getDefaultDbPath() {
     const srcAppPath = join(process.cwd(), 'src/app');
     return existsSync(srcAppPath) ? 'src/lib/db' : 'lib/db';
 }
+function getDrizzleConfigPath() {
+    const cwd = process.cwd();
+    const possiblePaths = ['drizzle.config.ts', 'drizzle.config.js', 'drizzle.config.mjs'];
+    for (const configPath of possiblePaths) {
+        if (existsSync(join(cwd, configPath))) {
+            return configPath;
+        }
+    }
+    return null;
+}
+function updateDrizzleConfigOutput(dbPath) {
+    const configPath = getDrizzleConfigPath();
+    if (!configPath) {
+        return false;
+    }
+    const fullPath = join(process.cwd(), configPath);
+    const expectedOut = `./${dbPath}/migrations`;
+    try {
+        let content = readFileSync(fullPath, 'utf-8');
+        // Check if output path already matches
+        if (content.includes(`out: "${expectedOut}"`) || content.includes(`out: '${expectedOut}'`)) {
+            return false; // Already correct
+        }
+        // Replace the out path - handles both single and double quotes
+        const outRegex = /out:\s*["']\.\/[^"']+["']/;
+        if (outRegex.test(content)) {
+            content = content.replace(outRegex, `out: "${expectedOut}"`);
+            writeFileSync(fullPath, content, 'utf-8');
+            console.log(`Updated ${configPath} output path to ${expectedOut}`);
+            return true;
+        }
+        return false;
+    }
+    catch (error) {
+        console.log(`Warning: Failed to update ${configPath}:`, error);
+        return false;
+    }
+}
+function runDrizzleKitGenerate(packageManager) {
+    if (!getDrizzleConfigPath()) {
+        console.log('Warning: No drizzle.config.ts found, skipping migration generation');
+        return false;
+    }
+    try {
+        // Use the package manager's exec command to run drizzle-kit
+        const execCmd = packageManager === 'pnpm'
+            ? 'pnpm drizzle-kit generate'
+            : packageManager === 'yarn'
+                ? 'yarn drizzle-kit generate'
+                : 'npx drizzle-kit generate';
+        console.log(`Running ${execCmd}...`);
+        execSync(execCmd, { stdio: 'inherit', cwd: process.cwd() });
+        return true;
+    }
+    catch (error) {
+        console.log('Warning: Failed to run drizzle-kit generate:', error);
+        return false;
+    }
+}
 function addEsbuildToPackageJson(packageManager) {
     const packageJsonPath = join(process.cwd(), 'package.json');
     if (!existsSync(packageJsonPath)) {
@@ -180,7 +239,15 @@ export async function generateFiles(options) {
             }
             // Clean up old files from previous runs (if dbPath changed)
             cleanupOldMigrationFiles(dbPath);
-            // Create empty migrations folder if none exists
+            // Update drizzle.config.ts output path to match our expected location
+            updateDrizzleConfigOutput(dbPath);
+            // Run drizzle-kit generate to create migration SQL files from schema
+            // This only works if drizzle.config.ts exists and schema is defined
+            const migrationsGenerated = runDrizzleKitGenerate(packageManager);
+            if (migrationsGenerated) {
+                console.log('Generated database migrations from schema');
+            }
+            // Create empty migrations folder if drizzle-kit didn't create one
             const migrationsPath = join(process.cwd(), dbPath, 'migrations');
             if (!existsSync(migrationsPath)) {
                 ensureDir(join(migrationsPath, 'dummy'));
@@ -197,7 +264,12 @@ export async function generateFiles(options) {
             }
         }
         else {
-            // For Node.js projects, write to scripts/ directory
+            // For Node.js projects, update drizzle config and run generate
+            updateDrizzleConfigOutput(dbPath);
+            const migrationsGenerated = runDrizzleKitGenerate(packageManager);
+            if (migrationsGenerated) {
+                console.log('Generated database migrations from schema');
+            }
             const migrateScript = generateMigrateScript({ projectType, dbPath });
             writeFile('scripts/migrate.ts', migrateScript);
         }

package/dist/index.js

@@ -96,16 +96,22 @@ async function main() {
     else {
         generatedFiles.push('package-lock.json');
     }
-    // Add migrate script if postgres included
+    // Add migrate script and migrations folder if postgres included
     if (response.includePostgres) {
+        // drizzle.config.ts may be updated to use correct output path
+        generatedFiles.push('drizzle.config.ts');
+        generatedFiles.push('drizzle.config.js');
+        generatedFiles.push('drizzle.config.mjs');
         if (project.type === 'nextjs') {
             // Use detected dbPath, or fall back to default based on project structure
             const dbPath = project.dbPath ?? (project.type === 'nextjs' ? 'lib/db' : 'db');
             generatedFiles.push(`${dbPath}/migrate.ts`);
+            generatedFiles.push(`${dbPath}/migrations`); // Include generated migrations
             generatedFiles.push('tsconfig.json'); // May be modified with exclude
         }
         else {
             generatedFiles.push('scripts/migrate.ts');
+            generatedFiles.push('scripts/migrations'); // Include generated migrations
         }
     }
     console.log(chalk.green('  ✓ Dockerfile'));
@@ -232,8 +238,9 @@ async function main() {
     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');
+    console.log('   feature/** → PR to develop → merge');
+    console.log('   develop → PR to staging → merge → staging deploys');
+    console.log('   staging → PR to main → merge → prod deploys\n');
 }
 main().catch((error) => {
     console.error(chalk.red('Error:'), error);

package/dist/templates/claude-rules.js

@@ -27,19 +27,23 @@ This project uses a trunk-based development workflow with deployment branches:
    - Fixes: \`fix/bug-description\`
    - Hotfixes: \`hotfix/urgent-fix\`
 
-2. **Build**: Push triggers GitHub Actions
+2. **Feature Development**: Push feature/fix/hotfix branches
    - Builds Docker image
    - Pushes to private registry
+   - Creates PR to \`develop\` branch
+
+3. **Integration**: Merge PR to \`develop\`
+   - Builds Docker image
    - Creates PR to \`staging\` branch
 
-3. **Staging Deployment**: Merge PR to \`staging\`
+4. **Staging Deployment**: Merge PR to \`staging\`
    - Coolify auto-deploys to staging server
    - GitHub Actions runs semantic versioning workflow
    - Creates \`staging-v*\` tags based on conventional commits
+   - Creates PR to \`main\` branch
    - Test changes in staging environment
 
-4. **Production Deployment**: Create PR from \`staging\` to \`main\`
-   - Review changes and merge
+5. **Production Deployment**: Merge PR to \`main\`
    - Coolify auto-deploys to production server
 
 ### Conventional Commits

package/dist/templates/docker-compose.js

@@ -39,7 +39,7 @@ export function generateDockerCompose(options) {
     volumes:
       - postgres-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U \${POSTGRES_USER:-postgres}"]
+      test: ["CMD-SHELL", "pg_isready -U \${POSTGRES_USER:-postgres} -d \${POSTGRES_DB:-app}"]
       interval: 10s
       timeout: 5s
       retries: 5`);

package/dist/templates/workflow.js

@@ -46,11 +46,21 @@ jobs:
       - name: Determine target branch
         id: target
         run: |
-          # All branches deploy to staging
-          # Promotion to main is a manual step
-          echo "branch=staging" >> $GITHUB_OUTPUT
+          SOURCE_BRANCH="\${{ github.ref_name }}"
+
+          # Feature/fix/hotfix branches target develop
+          if [[ "\\$SOURCE_BRANCH" == feature/* ]] || [[ "\\$SOURCE_BRANCH" == fix/* ]] || [[ "\\$SOURCE_BRANCH" == hotfix/* ]]; then
+            echo "branch=develop" >> \\$GITHUB_OUTPUT
+          # Develop targets staging
+          elif [[ "\\$SOURCE_BRANCH" == "develop" ]]; then
+            echo "branch=staging" >> \\$GITHUB_OUTPUT
+          # Staging/other branches don't create PRs (staging->main handled separately)
+          else
+            echo "branch=" >> \\$GITHUB_OUTPUT
+          fi
 
       - name: Create deploy PR
+        if: steps.target.outputs.branch != ''
         uses: actions/github-script@v7
         with:
           script: |

package/package.json

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