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

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

View File

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

View File

@ -669,7 +669,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
$this->add_to_error_output($e->getMessage());
throw $e;
} 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);
}
}