Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: env variables

Browse Source 
fix: revert custom network for a bit
This commit is contained in:
Andras Bacsai 2023-11-06 14:12:22 +01:00
parent 1ccb239797
commit 534372c29c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ProjectController.php
View File

@ -81,7 +81,9 @@ public function new()
$oneClickService = data_get($services, "$oneClickServiceName.compose"); $oneClickService = data_get($services, "$oneClickServiceName.compose");
$oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null); $oneClickDotEnvs = data_get($services, "$oneClickServiceName.envs", null);
if ($oneClickDotEnvs) { if ($oneClickDotEnvs) {
$oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/'); $oneClickDotEnvs = Str::of(base64_decode($oneClickDotEnvs))->split('/\r\n|\r|\n/')->filter(function ($value) {
return !empty($value);
});
} }
if ($oneClickService) { if ($oneClickService) {
$destination = StandaloneDocker::whereUuid($destination_uuid)->first(); $destination = StandaloneDocker::whereUuid($destination_uuid)->first();

4
app/Models/Service.php
View File

@ -118,7 +118,7 @@ public function saveComposeConfigs()
public function parse(bool $isNew = false): Collection public function parse(bool $isNew = false): Collection
{ {
ray()->clearAll(); // ray()->clearAll();
if ($this->docker_compose_raw) { if ($this->docker_compose_raw) {
try { try {
$yaml = Yaml::parse($this->docker_compose_raw); $yaml = Yaml::parse($this->docker_compose_raw);
@ -260,7 +260,7 @@ public function parse(bool $isNew = false): Collection
$networks = $serviceNetworks->toArray(); $networks = $serviceNetworks->toArray();
foreach ($definedNetwork as $key => $network) { foreach ($definedNetwork as $key => $network) {
$networks = array_merge($networks, [ $networks = array_merge($networks, [
$network => null $network
]); ]);
} }
data_set($service, 'networks', $networks); data_set($service, 'networks', $networks);