From 1069e33601d09e397c80d64588a6a86cac343ff2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 15 Aug 2024 13:32:44 +0200 Subject: [PATCH] refactor: Add conditional check for volumes in generate_compose_file() --- app/Jobs/ApplicationDeploymentJob.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 0ce794149..04011d9b1 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -1728,14 +1728,17 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue if (count($this->application->ports_mappings_array) > 0 && $this->pull_request_id === 0) { $docker_compose['services'][$this->container_name]['ports'] = $this->application->ports_mappings_array; } - if (! data_get($docker_compose, 'services.'.$this->container_name.'.volumes')) { - $docker_compose['services'][$this->container_name]['volumes'] = []; - } if (count($persistent_storages) > 0) { + if (! data_get($docker_compose, 'services.'.$this->container_name.'.volumes')) { + $docker_compose['services'][$this->container_name]['volumes'] = []; + } $docker_compose['services'][$this->container_name]['volumes'] = array_merge($docker_compose['services'][$this->container_name]['volumes'], $persistent_storages); } if (count($persistent_file_volumes) > 0) { + if (! data_get($docker_compose, 'services.'.$this->container_name.'.volumes')) { + $docker_compose['services'][$this->container_name]['volumes'] = []; + } $docker_compose['services'][$this->container_name]['volumes'] = array_merge($docker_compose['services'][$this->container_name]['volumes'], $persistent_file_volumes->map(function ($item) { return "$item->fs_path:$item->mount_path"; })->toArray());