diff --git a/app/Models/Application.php b/app/Models/Application.php index 60732a1ef..830cdc185 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -1100,10 +1100,10 @@ class Application extends BaseModel } $services = data_get($yaml, 'services', collect([])); $topLevel = collect([ - 'volumes' => collect(data_get($compose, 'volumes', [])), - 'networks' => collect(data_get($compose, 'networks', [])), - 'configs' => collect(data_get($compose, 'configs', [])), - 'secrets' => collect(data_get($compose, 'secrets', [])), + 'volumes' => collect(data_get($yaml, 'volumes', [])), + 'networks' => collect(data_get($yaml, 'networks', [])), + 'configs' => collect(data_get($yaml, 'configs', [])), + 'secrets' => collect(data_get($yaml, 'secrets', [])), ]); // If there are predefined volumes, make sure they are not null @@ -1475,7 +1475,6 @@ class Application extends BaseModel $environment = $environment->filter(function ($value, $key) { return ! str($key)->startsWith('SERVICE_FQDN') && ! str($key)->startsWith('SERVICE_URL'); }); - ray($environment); // Labels $fqdns = collect([]); diff --git a/tests/Feature/DockerComposeParseTest.php b/tests/Feature/DockerComposeParseTest.php index 54fd8bb21..343ee22d4 100644 --- a/tests/Feature/DockerComposeParseTest.php +++ b/tests/Feature/DockerComposeParseTest.php @@ -54,7 +54,12 @@ beforeEach(function () { ], 'networks' => [ 'default' => [ - 'ipv4_address' => '127.0.0.1', + 'name' => 'something', + 'external' => true, + ], + 'noinet' => [ + 'driver' => 'bridge', + 'internal' => true, ], ], ]; @@ -91,7 +96,8 @@ test('ComposeParse', function () { expect($output)->toBeInstanceOf(Collection::class); expect($outputOld)->toBeInstanceOf(Collection::class); - ray(Yaml::dump($output->toArray(), 10, 2)); + // ray(Yaml::dump($output->toArray(), 10, 2)); + ray(Yaml::dump($outputOld->toArray(), 10, 2)); });