refactor: Add conditional check for volumes in generate_compose_file()
This commit is contained in:
		| @@ -1728,14 +1728,17 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue | |||||||
|         if (count($this->application->ports_mappings_array) > 0 && $this->pull_request_id === 0) { |         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; |             $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 (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); |             $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 (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) { |             $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"; |                 return "$item->fs_path:$item->mount_path"; | ||||||
|             })->toArray()); |             })->toArray()); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Andras Bacsai
					Andras Bacsai