rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(deployment): Remove redundant docker rm when using --rm flag (#7688)

Browse source
This commit is contained in:
Andras Bacsai 2025-12-18 12:31:21 +01:00 committed by GitHub
commit d28e7f7f8a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Jobs/ApplicationDeploymentJob.php
View file

@ -3176,8 +3176,7 @@ private function graceful_shutdown_container(string $containerName)
try { try {
$timeout = isDev() ? 1 : 30; $timeout = isDev() ? 1 : 30;
$this->execute_remote_command( $this->execute_remote_command(
["docker stop -t $timeout $containerName", 'hidden' => true, 'ignore_errors' => true], ["docker stop -t $timeout $containerName", 'hidden' => true, 'ignore_errors' => true]
["docker rm -f $containerName", 'hidden' => true, 'ignore_errors' => true]
); );
} catch (Exception $error) { } catch (Exception $error) {
$this->application_deployment_queue->addLogEntry("Error stopping container $containerName: ".$error->getMessage(), 'stderr'); $this->application_deployment_queue->addLogEntry("Error stopping container $containerName: ".$error->getMessage(), 'stderr');

2
app/Jobs/DatabaseBackupJob.php
View file

@ -669,7 +669,7 @@ private function upload_to_s3(): void
$this->add_to_error_output($e->getMessage()); $this->add_to_error_output($e->getMessage());
throw $e; throw $e;
} finally { } finally {
$command = "docker rm -f backup-of-{$this->backup_log_uuid}"; $command = "docker stop backup-of-{$this->backup_log_uuid}";
instant_remote_process([$command], $this->server, true, false, null, disableMultiplexing: true); instant_remote_process([$command], $this->server, true, false, null, disableMultiplexing: true);
} }
} }