dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: raw compose deployment

Browse Source
This commit is contained in:
Andras Bacsai
2024-03-18 12:40:58 +01:00
parent faa9a982a9
commit 0a6dab1f24
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -423,7 +423,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
if ($this->application->settings->is_raw_compose_deployment_enabled) { if ($this->application->settings->is_raw_compose_deployment_enabled) {
if ($this->docker_compose_custom_start_command) { if ($this->docker_compose_custom_start_command) {
$this->execute_remote_command( $this->execute_remote_command(
["cd {$this->basedir} && {$this->docker_compose_custom_start_command}", "hidden" => true], [executeInDocker($this->deployment_uuid, "cd {$this->workdir} && {$this->docker_compose_custom_start_command}"), "hidden" => true],
); );
} else { } else {
$server_workdir = $this->application->workdir(); $server_workdir = $this->application->workdir();

2
app/Models/Application.php
View File

@@ -752,7 +752,7 @@ class Application extends BaseModel
$type = data_get_str($volume, 'type'); $type = data_get_str($volume, 'type');
$source = data_get_str($volume, 'source'); $source = data_get_str($volume, 'source');
} }
if ($type->value() === 'bind') { if ($type?->value() === 'bind') {
if ($source->value() === "/var/run/docker.sock") { if ($source->value() === "/var/run/docker.sock") {
continue; continue;
} }

2
bootstrap/helpers/shared.php
View File

@@ -818,7 +818,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
$isDirectory = (bool) data_get($volume, 'isDirectory', false) || (bool) data_get($volume, 'is_directory', false); $isDirectory = (bool) data_get($volume, 'isDirectory', false) || (bool) data_get($volume, 'is_directory', false);
} }
} }
if ($type->value() === 'bind') { if ($type?->value() === 'bind') {
if ($source->value() === "/var/run/docker.sock") { if ($source->value() === "/var/run/docker.sock") {
return $volume; return $volume;
} }