@envsync-cloud/deploy 0.20.0 → 0.20.3

package/dist/cli.js

@@ -2883,7 +2883,7 @@ function createApiDbUpgradeBackup(config, fromVersion, toVersion) {
     "postgres:17",
     "sh",
     "-lc",
-    `pg_dump -h ${config.services.stack_name}_postgres -U postgres -d envsync -Fc -f /backup/${fileName}`
+    `pg_dump -h postgres -U postgres -d envsync -Fc -f /backup/${fileName}`
   ]);
   logSuccess(`API DB upgrade snapshot created at ${hostPath}`);
   return hostPath;
@@ -2907,7 +2907,7 @@ function restoreApiDbUpgradeBackup(config, backupPath) {
     "postgres:17",
     "sh",
     "-lc",
-    `pg_restore --clean --if-exists --no-owner --no-privileges -h ${config.services.stack_name}_postgres -U postgres -d envsync /backup/${fileName}`
+    `pg_restore --clean --if-exists --no-owner --no-privileges -h postgres -U postgres -d envsync /backup/${fileName}`
   ]);
   logSuccess(`API DB upgrade snapshot restored from ${backupPath}`);
 }
@@ -3275,6 +3275,7 @@ function runApiMigrationJsonCommand(config, image, args) {
       executedMigrations: []
     };
   }
+  const migrateCli = args.map((arg) => JSON.stringify(arg)).join(" ");
   const output = run(
     "docker",
     [
@@ -3287,11 +3288,14 @@ function runApiMigrationJsonCommand(config, image, args) {
       "-e",
       "SKIP_ROOT_ENV=1",
       image,
-      "bun",
-      "run",
-      "scripts/migrate.ts",
-      ...args,
-      "--json"
+      "sh",
+      "-lc",
+      [
+        "if [ -d /app/packages/envsync-api ]; then cd /app/packages/envsync-api; fi",
+        `if [ -f scripts/migrate.enterprise.ts ]; then exec bun run scripts/migrate.enterprise.ts ${migrateCli} --json`,
+        `elif [ -f scripts/migrate.ts ]; then exec bun run scripts/migrate.ts ${migrateCli} --json`,
+        "else echo 'Migration CLI missing from API image (expected scripts/migrate.ts)' >&2; exit 1; fi"
+      ].join("; ")
     ],
     { quiet: true }
   );
@@ -4255,7 +4259,12 @@ async function cmdDeploy() {
       const rollbackTarget = preUpgradeHead ?? "zero";
       try {
         logWarn(`Candidate deploy failed after migration. Rolling schema back to ${rollbackTarget}.`);
-        runApiMigrationJsonCommand(config, config.images.api, ["rollback_to", rollbackTarget]);
+        try {
+          runApiMigrationJsonCommand(config, config.images.api, ["rollback_to", rollbackTarget]);
+        } catch {
+          logWarn(`Rollback with ${config.images.api} failed; retrying with ${activeImageBeforeUpgrade}.`);
+          runApiMigrationJsonCommand(config, activeImageBeforeUpgrade, ["rollback_to", rollbackTarget]);
+        }
       } catch (rollbackError) {
         if (!snapshotPath) {
           throw new Error(

package/dist/index.js

@@ -2745,7 +2745,7 @@ function createApiDbUpgradeBackup(config, fromVersion, toVersion) {
     "postgres:17",
     "sh",
     "-lc",
-    `pg_dump -h ${config.services.stack_name}_postgres -U postgres -d envsync -Fc -f /backup/${fileName}`
+    `pg_dump -h postgres -U postgres -d envsync -Fc -f /backup/${fileName}`
   ]);
   logSuccess(`API DB upgrade snapshot created at ${hostPath}`);
   return hostPath;
@@ -2769,7 +2769,7 @@ function restoreApiDbUpgradeBackup(config, backupPath) {
     "postgres:17",
     "sh",
     "-lc",
-    `pg_restore --clean --if-exists --no-owner --no-privileges -h ${config.services.stack_name}_postgres -U postgres -d envsync /backup/${fileName}`
+    `pg_restore --clean --if-exists --no-owner --no-privileges -h postgres -U postgres -d envsync /backup/${fileName}`
   ]);
   logSuccess(`API DB upgrade snapshot restored from ${backupPath}`);
 }
@@ -3137,6 +3137,7 @@ function runApiMigrationJsonCommand(config, image, args) {
       executedMigrations: []
     };
   }
+  const migrateCli = args.map((arg) => JSON.stringify(arg)).join(" ");
   const output = run(
     "docker",
     [
@@ -3149,11 +3150,14 @@ function runApiMigrationJsonCommand(config, image, args) {
       "-e",
       "SKIP_ROOT_ENV=1",
       image,
-      "bun",
-      "run",
-      "scripts/migrate.ts",
-      ...args,
-      "--json"
+      "sh",
+      "-lc",
+      [
+        "if [ -d /app/packages/envsync-api ]; then cd /app/packages/envsync-api; fi",
+        `if [ -f scripts/migrate.enterprise.ts ]; then exec bun run scripts/migrate.enterprise.ts ${migrateCli} --json`,
+        `elif [ -f scripts/migrate.ts ]; then exec bun run scripts/migrate.ts ${migrateCli} --json`,
+        "else echo 'Migration CLI missing from API image (expected scripts/migrate.ts)' >&2; exit 1; fi"
+      ].join("; ")
     ],
     { quiet: true }
   );
@@ -4117,7 +4121,12 @@ async function cmdDeploy() {
       const rollbackTarget = preUpgradeHead ?? "zero";
       try {
         logWarn(`Candidate deploy failed after migration. Rolling schema back to ${rollbackTarget}.`);
-        runApiMigrationJsonCommand(config, config.images.api, ["rollback_to", rollbackTarget]);
+        try {
+          runApiMigrationJsonCommand(config, config.images.api, ["rollback_to", rollbackTarget]);
+        } catch {
+          logWarn(`Rollback with ${config.images.api} failed; retrying with ${activeImageBeforeUpgrade}.`);
+          runApiMigrationJsonCommand(config, activeImageBeforeUpgrade, ["rollback_to", rollbackTarget]);
+        }
       } catch (rollbackError) {
         if (!snapshotPath) {
           throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@envsync-cloud/deploy",
-  "version": "0.20.0",
+  "version": "0.20.3",
   "description": "OSS CLI for self-hosted EnvSync deployment on Docker Swarm",
   "type": "module",
   "bin": {
@@ -42,10 +42,11 @@
   ],
   "dependencies": {
     "chalk": "^5.6.2",
-    "yaml": "^1.10.2"
+    "yaml": "^1.10.2",
+    "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@envsync-cloud/deploy-core": "workspace:*",
+    "@envsync-cloud/deploy-core": "0.20.3",
     "tsup": "^8.5.0",
     "typescript": "^5.9.2"
   },