From 028a2eb2755e3e30aca5cb01921727db0488c421 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 1 Dec 2023 22:16:27 +0100 Subject: [PATCH] Fix Docker compose build command and remove debug statements --- app/Actions/Service/StartService.php | 2 +- app/Http/Livewire/Project/Shared/EnvironmentVariable/Show.php | 1 - app/Jobs/ContainerStatusJob.php | 1 + app/Models/Application.php | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Actions/Service/StartService.php b/app/Actions/Service/StartService.php index 50f7fba82..3cd23ef85 100644 --- a/app/Actions/Service/StartService.php +++ b/app/Actions/Service/StartService.php @@ -21,7 +21,7 @@ class StartService $commands[] = "echo 'Pulling images.'"; $commands[] = "docker compose pull"; $commands[] = "echo 'Starting containers.'"; - $commands[] = "docker compose up -d --remove-orphans --force-recreate"; + $commands[] = "docker compose up -d --remove-orphans --force-recreate --build"; $commands[] = "docker network connect $service->uuid coolify-proxy >/dev/null 2>&1 || true"; $compose = data_get($service,'docker_compose',[]); $serviceNames = data_get(Yaml::parse($compose),'services',[]); diff --git a/app/Http/Livewire/Project/Shared/EnvironmentVariable/Show.php b/app/Http/Livewire/Project/Shared/EnvironmentVariable/Show.php index dc2808d08..eed0f7052 100644 --- a/app/Http/Livewire/Project/Shared/EnvironmentVariable/Show.php +++ b/app/Http/Livewire/Project/Shared/EnvironmentVariable/Show.php @@ -59,7 +59,6 @@ class Show extends Component { $this->validate(); $this->env->save(); - ray($this->env); $this->emit('success', 'Environment variable updated successfully.'); $this->emit('refreshEnvs'); } diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php index ead13f81a..090fd1896 100644 --- a/app/Jobs/ContainerStatusJob.php +++ b/app/Jobs/ContainerStatusJob.php @@ -34,6 +34,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted public function __construct(public Server $server) { + if (isDev()) $this->handle(); } diff --git a/app/Models/Application.php b/app/Models/Application.php index 0a9c8fac8..5d5082cbf 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -606,7 +606,6 @@ class Application extends BaseModel { if ($this->docker_compose_raw) { $mainCompose = parseDockerComposeFile(resource: $this, isNew: false, pull_request_id: $pull_request_id); - ray($this->docker_compose_pr_raw); if ($this->getMorphClass() === 'App\Models\Application' && $this->docker_compose_pr_raw) { parseDockerComposeFile(resource: $this, isNew: false, pull_request_id: $pull_request_id, is_pr: true); }