@panoptic-it-solutions/coolify-setup 1.1.37 → 1.1.39

package/dist/generator.js

@@ -214,6 +214,9 @@ export async function generateFiles(options) {
     // Generate GitHub workflow
     const workflow = generateWorkflow({
         projectName,
+        includePostgres,
+        dbPath,
+        packageManager,
     });
     writeFile('.github/workflows/build-deploy.yml', workflow);
     // Generate staging version workflow

package/dist/templates/docker-compose.js

@@ -6,6 +6,7 @@ export function generateDockerCompose(options) {
     // App service
     services.push(`  app:
     image: ${REGISTRY}/${projectName}-app:latest
+    pull_policy: always
     restart: unless-stopped
     expose:
       - "3000"

package/dist/templates/dockerfile.js

@@ -36,8 +36,9 @@ function generateNextjsDockerfile(options) {
     // postgres must be externalized due to pnpm's symlink structure causing resolution issues
     const migrationBundle = includePostgres ? `
 
-# Create migrations folder if it doesn't exist (may be gitignored)
-RUN mkdir -p ${dbPath}/migrations
+# Verify migrations exist (fail build if missing - don't silently create empty folder)
+RUN echo "Checking migrations:" && ls -la ${dbPath}/migrations/ && \\
+    test -f ${dbPath}/migrations/meta/_journal.json || (echo "ERROR: Migrations not found! Run 'drizzle-kit generate' and commit the files." && exit 1)
 
 # Build the migration bundle (single JS file with all deps baked in)
 # This avoids module resolution issues in the standalone container

package/dist/templates/staging-workflow.js

@@ -8,6 +8,7 @@ on:
 
 permissions:
   contents: write
+  pull-requests: write
 
 jobs:
   version:
@@ -172,5 +173,38 @@ jobs:
           echo "**Version:** v\${{ steps.version.outputs.version }}" >> \$GITHUB_STEP_SUMMARY
           echo "**Bump Type:** \${{ steps.bump.outputs.type }}" >> \$GITHUB_STEP_SUMMARY
           echo "**Skipped:** \${{ steps.version.outputs.skip_commit }}" >> \$GITHUB_STEP_SUMMARY
+
+      - name: Create sync PR to develop
+        if: steps.version.outputs.skip_commit != 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            // Check if sync 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: 'develop',
+              state: 'open'
+            });
+
+            if (prs.length > 0) {
+              console.log(\`Sync PR #\${prs[0].number} already exists for staging -> develop\`);
+              return;
+            }
+
+            try {
+              const { data: pr } = await github.rest.pulls.create({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: \`Sync: version bump v\${{ steps.version.outputs.version }} → develop\`,
+                body: \`Syncs the version bump commit back to develop to prevent package.json conflicts in future merges.\\n\\n**Version:** v\${{ steps.version.outputs.version }}\\n\\nMerge this PR to keep branches in sync.\`,
+                head: 'staging',
+                base: 'develop'
+              });
+              console.log(\`Created sync PR #\${pr.number}\`);
+            } catch (error) {
+              console.log(\`Sync PR creation skipped: \${error.message}\`);
+            }
 `;
 }

package/dist/templates/workflow.d.ts

@@ -1,4 +1,7 @@
 export interface WorkflowOptions {
     projectName: string;
+    includePostgres?: boolean;
+    dbPath?: string;
+    packageManager?: 'pnpm' | 'npm' | 'yarn';
 }
 export declare function generateWorkflow(options: WorkflowOptions): string;

package/dist/templates/workflow.js

@@ -1,6 +1,65 @@
 const REGISTRY = '10.0.0.2:5000';
 export function generateWorkflow(options) {
-    const { projectName } = options;
+    const { projectName, includePostgres = false, dbPath = 'src/lib/db', packageManager = 'pnpm' } = options;
+    const installCmd = packageManager === 'pnpm'
+        ? 'pnpm install --frozen-lockfile'
+        : packageManager === 'yarn'
+            ? 'yarn install --frozen-lockfile'
+            : 'npm ci';
+    const drizzleCmd = packageManager === 'pnpm'
+        ? 'pnpm drizzle-kit generate'
+        : packageManager === 'yarn'
+            ? 'yarn drizzle-kit generate'
+            : 'npx drizzle-kit generate';
+    const pnpmSetup = packageManager === 'pnpm' ? `
+      - name: Setup pnpm
+        run: corepack enable && corepack prepare pnpm@latest --activate
+` : '';
+    const migrationCheck = includePostgres ? `
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+${pnpmSetup}
+      - name: Install dependencies
+        run: ${installCmd}
+
+      - name: Check migrations are up to date
+        run: |
+          # Check if migrations folder exists and has files
+          if [ ! -d "${dbPath}/migrations" ] || [ -z "$(ls -A ${dbPath}/migrations 2>/dev/null)" ]; then
+            echo "::error::Migrations folder missing or empty!"
+            echo "Run locally: ${drizzleCmd}"
+            echo "Then commit the generated migration files."
+            exit 1
+          fi
+
+          # Run generate and check if it creates NEW migration files
+          # (this catches schema changes that weren't migrated)
+          BEFORE_COUNT=$(find ${dbPath}/migrations -name "*.sql" 2>/dev/null | wc -l)
+          ${drizzleCmd}
+          AFTER_COUNT=$(find ${dbPath}/migrations -name "*.sql" 2>/dev/null | wc -l)
+
+          if [ "$AFTER_COUNT" -gt "$BEFORE_COUNT" ]; then
+            echo "::error::Schema changes detected without migrations!"
+            echo "drizzle-kit generate created new migration files."
+            echo ""
+            echo "To fix this, run locally:"
+            echo "  ${drizzleCmd}"
+            echo ""
+            echo "Then commit the generated migration files."
+            git status ${dbPath}/migrations
+            exit 1
+          fi
+
+          echo "Migrations are up to date"
+
+      - name: Verify migrations exist
+        run: |
+          echo "Checking migrations in build context:"
+          ls -la ${dbPath}/migrations/
+          test -f ${dbPath}/migrations/meta/_journal.json || (echo "ERROR: _journal.json missing!" && exit 1)
+` : '';
     return `name: Build and Deploy
 
 on:
@@ -26,7 +85,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
+${migrationCheck}
       - name: Get commit SHA
         id: sha
         run: echo "sha=\$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
@@ -36,7 +95,7 @@ jobs:
           export COMMIT_SHA=\${{ steps.sha.outputs.sha }}
           export COMPOSE_PROJECT_NAME=\${{ env.PROJECT_NAME }}
 
-          docker compose -f docker-compose.build.yml build
+          docker compose -f docker-compose.build.yml build --no-cache
           docker compose -f docker-compose.build.yml push
 
           # Also tag and push as latest
@@ -49,14 +108,14 @@ jobs:
           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
+          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
+          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
+            echo "branch=" >> $GITHUB_OUTPUT
           fi
 
       - name: Create deploy PR

package/package.json

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