AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Rewrite docker-compose-generator code to make sure only processed fragments are integrated

Browse Source
This commit is contained in:
nicolas.dorier
2020-01-21 18:58:55 +09:00
parent de6314587d
commit 3118e62f3a
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
docker-compose-generator/src/DockerComposeDefinition.cs
View File

@@ -50,9 +50,6 @@ namespace DockerGenerator
var recommendedFragments = new HashSet<FragmentName>(); var recommendedFragments = new HashSet<FragmentName>();
var processedFragments = new HashSet<FragmentName>(); var processedFragments = new HashSet<FragmentName>();
var unprocessedFragments = new HashSet<FragmentName>(); var unprocessedFragments = new HashSet<FragmentName>();
var services = new List<KeyValuePair<YamlNode, YamlNode>>();
var volumes = new List<KeyValuePair<YamlNode, YamlNode>>();
var networks = new List<KeyValuePair<YamlNode, YamlNode>>();
var exclusives = new List<(FragmentName FragmentName, string Exclusivity)>(); var exclusives = new List<(FragmentName FragmentName, string Exclusivity)>();
var incompatibles = new List<(FragmentName FragmentName, string Exclusivity)>(); var incompatibles = new List<(FragmentName FragmentName, string Exclusivity)>();
@@ -74,19 +71,6 @@ namespace DockerGenerator
{ {
var doc = o.Item2; var doc = o.Item2;
var fragment = o.f; var fragment = o.f;
if (doc.Children.ContainsKey("services") && doc.Children["services"] is YamlMappingNode fragmentServicesRoot)
{
services.AddRange(fragmentServicesRoot.Children);
}
if (doc.Children.ContainsKey("volumes") && doc.Children["volumes"] is YamlMappingNode fragmentVolumesRoot)
{
volumes.AddRange(fragmentVolumesRoot.Children);
}
if (doc.Children.ContainsKey("networks") && doc.Children["networks"] is YamlMappingNode fragmentNetworksRoot)
{
networks.AddRange(fragmentNetworksRoot.Children);
}
if (doc.Children.ContainsKey("exclusive") && doc.Children["exclusive"] is YamlSequenceNode fragmentExclusiveRoot) if (doc.Children.ContainsKey("exclusive") && doc.Children["exclusive"] is YamlSequenceNode fragmentExclusiveRoot)
{ {
foreach (var node in fragmentExclusiveRoot) foreach (var node in fragmentExclusiveRoot)
@@ -154,6 +138,27 @@ namespace DockerGenerator
ConsoleUtils.WriteLine($"\t{fragment} not found in {fragmentPath}, ignoring...", ConsoleColor.Yellow); ConsoleUtils.WriteLine($"\t{fragment} not found in {fragmentPath}, ignoring...", ConsoleColor.Yellow);
} }
var services = new List<KeyValuePair<YamlNode, YamlNode>>();
var volumes = new List<KeyValuePair<YamlNode, YamlNode>>();
var networks = new List<KeyValuePair<YamlNode, YamlNode>>();
foreach (var o in processedFragments.Select(f => (f, ParseDocument(f))).ToList())
{
var doc = o.Item2;
var fragment = o.f;
if (doc.Children.ContainsKey("services") && doc.Children["services"] is YamlMappingNode fragmentServicesRoot)
{
services.AddRange(fragmentServicesRoot.Children);
}
if (doc.Children.ContainsKey("volumes") && doc.Children["volumes"] is YamlMappingNode fragmentVolumesRoot)
{
volumes.AddRange(fragmentVolumesRoot.Children);
}
if (doc.Children.ContainsKey("networks") && doc.Children["networks"] is YamlMappingNode fragmentNetworksRoot)
{
networks.AddRange(fragmentNetworksRoot.Children);
}
}
YamlMappingNode output = new YamlMappingNode(); YamlMappingNode output = new YamlMappingNode();
output.Add("version", new YamlScalarNode("3") { Style = YamlDotNet.Core.ScalarStyle.DoubleQuoted }); output.Add("version", new YamlScalarNode("3") { Style = YamlDotNet.Core.ScalarStyle.DoubleQuoted });
output.Add("services", new YamlMappingNode(Merge(services))); output.Add("services", new YamlMappingNode(Merge(services)));