Merge branch 'next' into feat/scheduled-tasks-cron

This commit is contained in:
Andras Bacsai
2024-01-10 12:03:48 +01:00
committed by GitHub
166 changed files with 1827 additions and 1542 deletions

View File

@@ -760,7 +760,6 @@ class Application extends BaseModel
// if (count($this->ports_mappings_array) > 0) {
// $deployment->addLogEntry('Application has ports mapped to the host system, rolling update is not supported.');
$containers = getCurrentApplicationContainerStatus($server, $this->id, $pullRequestId);
ray($containers);
// if ($pullRequestId === 0) {
// $containers = $containers->filter(function ($container) use ($containerName) {
// return data_get($container, 'Names') !== $containerName;
@@ -872,7 +871,6 @@ class Application extends BaseModel
} else {
$git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command_base);
}
ray($git_clone_command);
if ($exec_in_docker) {
$commands = collect([
executeInDocker($deployment_uuid, "mkdir -p /root/.ssh"),