Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix parsing docker-composer files with no "version" #878

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Fix parsing docker-composer files with no "version" #878

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Configurator/DockerComposeConfigurator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ private function configureDockerCompose(Recipe $recipe, array $config, bool $upd
}

// Keep end in memory (check break line on previous line)
$endAt[$node] = '' !== trim($lines[$i - 1]) ? $i : $i - 1;
$endAt[$node] = !$i || '' !== trim($lines[$i - 1]) ? $i : $i - 1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I change your fix a bit because the previous code was putting a -1 into $endAt[$node].
Can you please confirm this works for you?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it works

$node = $matches[1];
if (!isset($nodesLines[$node])) {
$nodesLines[$node] = [];
Expand Down