@panoptic-it-solutions/coolify-setup 1.1.42 → 1.1.44

package/dist/generator.js

@@ -63,6 +63,14 @@ function runDrizzleKitGenerate(packageManager) {
         return false;
     }
     try {
+        // First, update drizzle-orm and drizzle-kit to latest versions to avoid version mismatch
+        const updateCmd = packageManager === 'pnpm'
+            ? 'pnpm update drizzle-orm drizzle-kit'
+            : packageManager === 'yarn'
+                ? 'yarn upgrade drizzle-orm drizzle-kit'
+                : 'npm update drizzle-orm drizzle-kit';
+        console.log(`Updating drizzle packages...`);
+        execSync(updateCmd, { stdio: 'inherit', cwd: process.cwd() });
         // Use the package manager's exec command to run drizzle-kit
         const execCmd = packageManager === 'pnpm'
             ? 'pnpm drizzle-kit generate'

package/dist/git.js

@@ -2,6 +2,51 @@ import { execSync, exec } from 'child_process';
 import { promisify } from 'util';
 const execAsync = promisify(exec);
 const ORG = 'Panoptic-IT-Solutions';
+// Cache the detected remote name to avoid repeated lookups
+let cachedRemoteName = null;
+/**
+ * Find the remote that points to Panoptic-IT-Solutions.
+ * Could be 'origin', 'panoptic', or any other name.
+ * Returns null if no Panoptic remote is found.
+ */
+function findPanopticRemote() {
+    if (cachedRemoteName !== null) {
+        return cachedRemoteName || null;
+    }
+    try {
+        const remotes = run('git remote').split('\n').filter(Boolean);
+        for (const remote of remotes) {
+            try {
+                const url = run(`git remote get-url ${remote}`);
+                if (url.includes(`github.com/${ORG}/`) || url.includes(`github.com:${ORG}/`)) {
+                    cachedRemoteName = remote;
+                    return remote;
+                }
+            }
+            catch {
+                // Skip remotes that fail to get URL
+            }
+        }
+    }
+    catch {
+        // Not a git repo or no remotes
+    }
+    cachedRemoteName = ''; // Empty string means we checked but found nothing
+    return null;
+}
+/**
+ * Get the remote name to use for git operations.
+ * Prefers the Panoptic remote if found, otherwise falls back to 'origin'.
+ */
+function getRemoteName() {
+    return findPanopticRemote() || 'origin';
+}
+/**
+ * Clear the cached remote name (useful after adding/removing remotes)
+ */
+function clearRemoteCache() {
+    cachedRemoteName = null;
+}
 function run(command) {
     return execSync(command, { encoding: 'utf-8', stdio: 'pipe' }).trim();
 }
@@ -10,8 +55,9 @@ async function runAsync(command) {
     return stdout.trim();
 }
 function getGitRemoteUrl() {
+    const remote = getRemoteName();
     try {
-        return run('git remote get-url origin');
+        return run(`git remote get-url ${remote}`);
     }
     catch {
         return null;
@@ -40,6 +86,8 @@ export async function commitAndPushToDevelop(files, originalBranch) {
         branchName: 'develop',
         warnings: [],
     };
+    // Get the remote name (could be 'origin', 'panoptic', etc.)
+    const remote = getRemoteName();
     // Initialize git if not already a repo
     if (!isGitRepo()) {
         run('git init');
@@ -84,19 +132,19 @@ export async function commitAndPushToDevelop(files, originalBranch) {
         if (sourceBranch === 'develop') {
             // Already on develop, pull and push
             try {
-                run('git pull --rebase origin develop');
+                run(`git pull --rebase ${remote} develop`);
             }
             catch {
                 // Pull might fail if remote doesn't exist yet, that's ok
             }
-            run('git push origin develop');
+            run(`git push ${remote} develop`);
         }
         else {
             // On a feature branch - need to merge into develop
             // First check if develop exists remotely
             let developExistsRemotely = false;
             try {
-                run('git fetch origin develop');
+                run(`git fetch ${remote} develop`);
                 developExistsRemotely = true;
             }
             catch {
@@ -119,7 +167,7 @@ export async function commitAndPushToDevelop(files, originalBranch) {
                         run('git checkout develop');
                     }
                     else {
-                        run('git checkout -b develop origin/develop');
+                        run(`git checkout -b develop ${remote}/develop`);
                     }
                     checkoutSucceeded = true;
                 }
@@ -127,9 +175,9 @@ export async function commitAndPushToDevelop(files, originalBranch) {
                     // Checkout failed - might be worktree issue
                     // Try fast-forward push if source branch contains all develop commits
                     try {
-                        run(`git merge-base --is-ancestor origin/develop ${sourceBranch}`);
+                        run(`git merge-base --is-ancestor ${remote}/develop ${sourceBranch}`);
                         // Source branch is ahead of develop, can fast-forward push
-                        run(`git push origin ${sourceBranch}:develop`);
+                        run(`git push ${remote} ${sourceBranch}:develop`);
                         result.pushed = true;
                         return result;
                     }
@@ -141,7 +189,7 @@ export async function commitAndPushToDevelop(files, originalBranch) {
                 if (checkoutSucceeded) {
                     // Pull latest changes
                     try {
-                        run('git pull --rebase origin develop');
+                        run(`git pull --rebase ${remote} develop`);
                     }
                     catch {
                         // Pull might fail, continue
@@ -160,7 +208,7 @@ export async function commitAndPushToDevelop(files, originalBranch) {
                         }
                         throw new Error(`Merge conflict between develop and ${sourceBranch}. Please resolve manually.`);
                     }
-                    run('git push origin develop');
+                    run(`git push ${remote} develop`);
                     // Return to original branch
                     try {
                         run(`git checkout ${sourceBranch}`);
@@ -172,7 +220,7 @@ export async function commitAndPushToDevelop(files, originalBranch) {
             }
             else {
                 // Develop doesn't exist remotely, create it from source branch
-                run(`git push origin ${sourceBranch}:develop`);
+                run(`git push ${remote} ${sourceBranch}:develop`);
             }
         }
         result.pushed = true;
@@ -193,6 +241,8 @@ export async function setupGitHub(projectName) {
         existingRemote: null,
         warnings: [],
     };
+    // Get the remote name (could be 'origin', 'panoptic', etc.)
+    const remote = getRemoteName();
     // Initialize git if not already a repo
     if (!isGitRepo()) {
         run('git init');
@@ -220,7 +270,7 @@ export async function setupGitHub(projectName) {
         // Validate remote points to the correct repo
         if (!isCorrectRemote(existingRemote, projectName)) {
             result.warnings.push(`Existing remote '${existingRemote}' does not match expected repo '${ORG}/${projectName}'. ` +
-                `Remove it with 'git remote remove origin' and re-run setup to create the correct repo.`);
+                `Remove it with 'git remote remove ${remote}' and re-run setup to create the correct repo.`);
             // Don't proceed with operations that would push to the wrong repo
             return result;
         }
@@ -272,15 +322,15 @@ export async function setupGitHub(projectName) {
                     try {
                         // First fetch to check if develop exists remotely
                         try {
-                            run('git fetch origin develop');
+                            run(`git fetch ${remote} develop`);
                             // Check if current branch contains all develop commits (fast-forward possible)
-                            run(`git merge-base --is-ancestor origin/develop ${currentBranch}`);
+                            run(`git merge-base --is-ancestor ${remote}/develop ${currentBranch}`);
                         }
                         catch {
                             // Either develop doesn't exist remotely, or can't fast-forward
                             // Try push anyway - will fail if develop exists and diverged
                         }
-                        run(`git push origin ${currentBranch}:develop -u`);
+                        run(`git push ${remote} ${currentBranch}:develop -u`);
                         result.developBranchCreated = true;
                         result.repoPushed = true;
                         // Skip the rest of develop push logic since we already pushed
@@ -294,12 +344,12 @@ export async function setupGitHub(projectName) {
                 if (checkoutSucceeded) {
                     // Pull latest changes before pushing to avoid non-fast-forward errors
                     try {
-                        run('git pull --rebase origin develop');
+                        run(`git pull --rebase ${remote} develop`);
                     }
                     catch {
                         // Pull might fail if remote doesn't exist yet, that's ok
                     }
-                    run('git push origin develop -u');
+                    run(`git push ${remote} develop -u`);
                     result.developBranchCreated = true;
                     result.repoPushed = true;
                 }
@@ -307,12 +357,12 @@ export async function setupGitHub(projectName) {
             else {
                 // Already on develop
                 try {
-                    run('git pull --rebase origin develop');
+                    run(`git pull --rebase ${remote} develop`);
                 }
                 catch {
                     // Pull might fail if remote doesn't exist yet, that's ok
                 }
-                run('git push origin develop -u');
+                run(`git push ${remote} develop -u`);
                 result.developBranchCreated = true;
                 result.repoPushed = true;
             }
@@ -324,13 +374,13 @@ export async function setupGitHub(projectName) {
     // Create main branch from develop if it doesn't exist
     try {
         // Check if main exists remotely
-        run('git ls-remote --exit-code --heads origin main');
+        run(`git ls-remote --exit-code --heads ${remote} main`);
         result.mainBranchPushed = true; // Already exists
     }
     catch {
         // Main doesn't exist, create it from develop
         try {
-            run('git push origin develop:main');
+            run(`git push ${remote} develop:main`);
             result.mainBranchPushed = true;
         }
         catch {
@@ -340,13 +390,13 @@ export async function setupGitHub(projectName) {
     // Create staging branch from develop if it doesn't exist
     try {
         // Check if staging exists remotely
-        run('git ls-remote --exit-code --heads origin staging');
+        run(`git ls-remote --exit-code --heads ${remote} staging`);
         result.stagingBranchCreated = true; // Already exists
     }
     catch {
         // Staging doesn't exist, create it from develop
         try {
-            run('git push origin develop:staging');
+            run(`git push ${remote} develop:staging`);
             result.stagingBranchCreated = true;
         }
         catch {

package/dist/index.js

@@ -229,6 +229,12 @@ async function main() {
             console.log(chalk.green('   ✅ MINIO_ENDPOINT=http://minio:9000\n'));
         }
         console.log(chalk.yellow('   Docker containers use service names for internal DNS resolution.\n'));
+        console.log(chalk.bgRed.white.bold(' ⚠️  IMPORTANT: Database Not Shared Between Environments '));
+        console.log(chalk.yellow('\n   Each environment (staging, production) has its OWN database.'));
+        console.log(chalk.yellow('   Deploying to staging does NOT copy production data.\n'));
+        console.log('   To copy data between environments:');
+        console.log('   • Use pg_dump/pg_restore for PostgreSQL');
+        console.log('   • Or set up a shared external database service\n');
     }
     console.log(chalk.bold('Branching Strategy:\n'));
     console.log('   develop     → Default branch, main development');

package/package.json

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