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

revert last commits

Browse Source
This commit is contained in:
Andras Bacsai 2023-10-04 18:06:25 +02:00
parent 32bb2780f2
commit 2971e360d7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Models/Service.php
View File

@ -140,7 +140,7 @@ class Service extends BaseModel
} }
$definedNetwork = collect([$this->uuid]); $definedNetwork = collect([$this->uuid]);
$services = collect($services)->map(function ($service, $serviceName) use ($topLevelVolumes, $topLevelNetworks, $definedNetwork, $isNew, $generatedServiceFQDNS, $yaml) { $services = collect($services)->map(function ($service, $serviceName) use ($topLevelVolumes, $topLevelNetworks, $definedNetwork, $isNew, $generatedServiceFQDNS) {
$serviceVolumes = collect(data_get($service, 'volumes', [])); $serviceVolumes = collect(data_get($service, 'volumes', []));
$servicePorts = collect(data_get($service, 'ports', [])); $servicePorts = collect(data_get($service, 'ports', []));
$serviceNetworks = collect(data_get($service, 'networks', [])); $serviceNetworks = collect(data_get($service, 'networks', []));
@ -266,7 +266,7 @@ class Service extends BaseModel
// Collect/create/update volumes // Collect/create/update volumes
if ($serviceVolumes->count() > 0) { if ($serviceVolumes->count() > 0) {
$serviceVolumes = $serviceVolumes->map(function ($volume) use ($savedService, $topLevelVolumes, $isNew, $yaml) { $serviceVolumes = $serviceVolumes->map(function ($volume) use ($savedService, $topLevelVolumes) {
$type = null; $type = null;
$source = null; $source = null;
$target = null; $target = null;
@ -430,11 +430,11 @@ class Service extends BaseModel
$savedService->save(); $savedService->save();
} }
} }
data_forget($service, "environment.$variableName"); // data_forget($service, "environment.$variableName");
$yaml = data_forget($yaml, "services.$serviceName.environment.$variableName"); // $yaml = data_forget($yaml, "services.$serviceName.environment.$variableName");
if (count(data_get($yaml, 'services.' . $serviceName . '.environment')) === 0) { // if (count(data_get($yaml, 'services.' . $serviceName . '.environment')) === 0) {
$yaml = data_forget($yaml, "services.$serviceName.environment"); // $yaml = data_forget($yaml, "services.$serviceName.environment");
} // }
continue; continue;
} }
if ($value?->startsWith('$')) { if ($value?->startsWith('$')) {
@ -562,7 +562,6 @@ class Service extends BaseModel
} }
}); });
data_set($service, 'environment', $withoutServiceEnvs->toArray()); data_set($service, 'environment', $withoutServiceEnvs->toArray());
$this->docker_compose_raw = Yaml::dump($yaml, 10, 2);
return $service; return $service;
}); });
$finalServices = [ $finalServices = [
@ -571,6 +570,7 @@ class Service extends BaseModel
'volumes' => $topLevelVolumes->toArray(), 'volumes' => $topLevelVolumes->toArray(),
'networks' => $topLevelNetworks->toArray(), 'networks' => $topLevelNetworks->toArray(),
]; ];
$this->docker_compose_raw = Yaml::dump($yaml, 10, 2);
$this->docker_compose = Yaml::dump($finalServices, 10, 2); $this->docker_compose = Yaml::dump($finalServices, 10, 2);
$this->save(); $this->save();
$this->saveComposeConfigs(); $this->saveComposeConfigs();