diff --git a/packages/server/src/utils/backups/utils.ts b/packages/server/src/utils/backups/utils.ts index 34f698e9..0d4471f6 100644 --- a/packages/server/src/utils/backups/utils.ts +++ b/packages/server/src/utils/backups/utils.ts @@ -21,9 +21,6 @@ export const scheduleBackup = (backup: BackupSchedule) => { compose, } = backup; scheduleJob(backupId, schedule, async () => { - console.log("backup", backup); - console.log("databaseType", databaseType); - console.log("schedule", schedule); if (backup.backupType === "database") { if (databaseType === "postgres" && postgres) { await runPostgresBackup(postgres, backup); diff --git a/packages/server/src/utils/schedules/utils.ts b/packages/server/src/utils/schedules/utils.ts index 19513c1b..d1f5ef78 100644 --- a/packages/server/src/utils/schedules/utils.ts +++ b/packages/server/src/utils/schedules/utils.ts @@ -49,12 +49,12 @@ export const runCommand = async (scheduleId: string) => { application.appName, application.serverId, ); - containerId = container.Id; + containerId = container?.Id || ""; serverId = application.serverId || ""; } if (scheduleType === "compose" && compose) { const container = await getComposeContainer(compose, serviceName || ""); - containerId = container.Id; + containerId = container?.Id || ""; serverId = compose.serverId || ""; } @@ -64,8 +64,8 @@ export const runCommand = async (scheduleId: string) => { serverId, ` set -e - echo "Running command: docker exec ${containerId} ${shellType} -c \"${command}\"" >> ${deployment.logPath}; - docker exec ${containerId} ${shellType} -c "${command}" >> ${deployment.logPath} 2>> ${deployment.logPath} || { + echo "Running command: docker exec ${containerId} ${shellType} -c '${command}'" >> ${deployment.logPath}; + docker exec ${containerId} ${shellType} -c '${command}' >> ${deployment.logPath} 2>> ${deployment.logPath} || { echo "❌ Command failed" >> ${deployment.logPath}; exit 1; } @@ -81,7 +81,7 @@ export const runCommand = async (scheduleId: string) => { try { writeStream.write( - `docker exec ${containerId} ${shellType} -c "${command}"\n`, + `docker exec ${containerId} ${shellType} -c ${command}\n`, ); await spawnAsync( "docker",