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

fix: network handling

Browse Source 
fix: environment variable handling
This commit is contained in:
Andras Bacsai
2024-10-03 15:04:40 +02:00
parent ee5eb427c9
commit 1d3494a6ba
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bootstrap/helpers/shared.php
View File

@@ -708,10 +708,12 @@ function getTopLevelNetworks(Service|Application $resource)
return $value == $networkName || $key == $networkName; return $value == $networkName || $key == $networkName;
}); });
if (! $networkExists) { if (! $networkExists) {
if (is_string($networkDetails) || is_int($networkDetails)) {
$topLevelNetworks->put($networkDetails, null); $topLevelNetworks->put($networkDetails, null);
} }
} }
} }
}
$definedNetworkExists = $topLevelNetworks->contains(function ($value, $_) use ($definedNetwork) { $definedNetworkExists = $topLevelNetworks->contains(function ($value, $_) use ($definedNetwork) {
return $value == $definedNetwork; return $value == $definedNetwork;
@@ -758,10 +760,12 @@ function getTopLevelNetworks(Service|Application $resource)
return $value == $networkName || $key == $networkName; return $value == $networkName || $key == $networkName;
}); });
if (! $networkExists) { if (! $networkExists) {
if (is_string($networkDetails) || is_int($networkDetails)) {
$topLevelNetworks->put($networkDetails, null); $topLevelNetworks->put($networkDetails, null);
} }
} }
} }
}
$definedNetworkExists = $topLevelNetworks->contains(function ($value, $_) use ($definedNetwork) { $definedNetworkExists = $topLevelNetworks->contains(function ($value, $_) use ($definedNetwork) {
return $value == $definedNetwork; return $value == $definedNetwork;
}); });
@@ -1608,10 +1612,12 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
return $value == $networkName || $key == $networkName; return $value == $networkName || $key == $networkName;
}); });
if (! $networkExists) { if (! $networkExists) {
if (is_string($networkDetails) || is_int($networkDetails)) {
$topLevelNetworks->put($networkDetails, null); $topLevelNetworks->put($networkDetails, null);
} }
} }
} }
}
// Collect/create/update ports // Collect/create/update ports
$collectedPorts = collect([]); $collectedPorts = collect([]);
@@ -2523,10 +2529,12 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
return $value == $networkName || $key == $networkName; return $value == $networkName || $key == $networkName;
}); });
if (! $networkExists) { if (! $networkExists) {
if (is_string($networkDetails) || is_int($networkDetails)) {
$topLevelNetworks->put($networkDetails, null); $topLevelNetworks->put($networkDetails, null);
} }
} }
} }
}
// Collect/create/update ports // Collect/create/update ports
$collectedPorts = collect([]); $collectedPorts = collect([]);
if ($servicePorts->count() > 0) { if ($servicePorts->count() > 0) {
@@ -3912,6 +3920,7 @@ function convertComposeEnvironmentToArray($environment)
} else { } else {
// Example: $environment = ['FOO=bar', 'BAZ=qux']; // Example: $environment = ['FOO=bar', 'BAZ=qux'];
foreach ($environment as $value) { foreach ($environment as $value) {
if (is_string($value)) {
$parts = explode('=', $value, 2); $parts = explode('=', $value, 2);
$key = $parts[0]; $key = $parts[0];
$realValue = $parts[1] ?? ''; $realValue = $parts[1] ?? '';
@@ -3920,6 +3929,7 @@ function convertComposeEnvironmentToArray($environment)
} }
} }
} }
}
return $convertedServiceVariables; return $convertedServiceVariables;