Merge branch 'next' into improve-scheduled-tasks

app/Jobs/ApplicationDeploymentJob.php

@@ -1173,7 +1173,10 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
             if ($this->build_pack !== 'dockercompose') {
                 $detectedPort = $this->application->detectPortFromEnvironment(false);
                 if ($detectedPort && ! empty($ports) && ! in_array($detectedPort, $ports)) {
-                    ray()->orange("PORT environment variable ({$detectedPort}) does not match configured ports_exposes: ".implode(',', $ports));
+                    $this->application_deployment_queue->addLogEntry(
+                        "Warning: PORT environment variable ({$detectedPort}) does not match configured ports_exposes: ".implode(',', $ports).'. It could case "bad gateway" or "no server" errors. Check the "General" page to fix it.',
+                        'stderr'
+                    );
                 }
             }
 
@@ -3062,7 +3065,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     {
         // Ensure .env file exists before docker compose tries to load it (defensive programming)
         $this->execute_remote_command(
-            ["touch {$this->workdir}/.env", 'hidden' => true],
             ["touch {$this->configuration_dir}/.env", 'hidden' => true],
         );
 

app/Jobs/DeleteResourceJob.php

@@ -145,25 +145,17 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
 
                 // Check if helper container exists and kill it
                 $deployment_uuid = $activeDeployment->deployment_uuid;
-                $checkCommand = "docker ps -a --filter name={$deployment_uuid} --format '{{.Names}}'";
+                $escapedDeploymentUuid = escapeshellarg($deployment_uuid);
+                $checkCommand = "docker ps -a --filter name={$escapedDeploymentUuid} --format '{{.Names}}'";
                 $containerExists = instant_remote_process([$checkCommand], $server);
 
                 if ($containerExists && str($containerExists)->trim()->isNotEmpty()) {
-                    instant_remote_process(["docker rm -f {$deployment_uuid}"], $server);
+                    instant_remote_process(["docker rm -f {$escapedDeploymentUuid}"], $server);
                     $activeDeployment->addLogEntry('Deployment container stopped.');
                 } else {
                     $activeDeployment->addLogEntry('Helper container not yet started. Deployment will be cancelled when job checks status.');
                 }
 
-                // Kill running process if process ID exists
-                if ($activeDeployment->current_process_id) {
-                    try {
-                        $processKillCommand = "kill -9 {$activeDeployment->current_process_id}";
-                        instant_remote_process([$processKillCommand], $server);
-                    } catch (\Throwable $e) {
-                        // Process might already be gone
-                    }
-                }
             } catch (\Throwable $e) {
                 // Silently handle errors during deployment cancellation
             }
@@ -171,7 +163,8 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
 
         try {
             if ($server->isSwarm()) {
-                instant_remote_process(["docker stack rm {$application->uuid}-{$pull_request_id}"], $server);
+                $escapedStackName = escapeshellarg("{$application->uuid}-{$pull_request_id}");
+                instant_remote_process(["docker stack rm {$escapedStackName}"], $server);
             } else {
                 $containers = getCurrentApplicationContainerStatus($server, $application->id, $pull_request_id)->toArray();
                 $this->stopPreviewContainers($containers, $server);