From ba9ee548f415986ddc430bddab05c3005b38b367 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 16 Aug 2018 15:12:21 +0900 Subject: [PATCH] Remove empty additional fragments --- docker-compose-generator/src/DockerComposition.cs | 3 ++- docker-compose-generator/src/Program.cs | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-generator/src/DockerComposition.cs b/docker-compose-generator/src/DockerComposition.cs index 8c60a3f..5ec1f77 100644 --- a/docker-compose-generator/src/DockerComposition.cs +++ b/docker-compose-generator/src/DockerComposition.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Collections.Generic; using System.Text; @@ -40,7 +41,7 @@ namespace DockerGenerator } composition.SelectedProxy = (Environment.GetEnvironmentVariable("BTCPAYGEN_REVERSEPROXY") ?? "").ToLowerInvariant(); composition.SelectedLN = (Environment.GetEnvironmentVariable("BTCPAYGEN_LIGHTNING") ?? "").ToLowerInvariant(); - composition.AdditionalFragments = (Environment.GetEnvironmentVariable("BTCPAYGEN_ADDITIONAL_FRAGMENTS") ?? "").ToLowerInvariant().Split(';'); + composition.AdditionalFragments = (Environment.GetEnvironmentVariable("BTCPAYGEN_ADDITIONAL_FRAGMENTS") ?? "").ToLowerInvariant().Split(';').Where(t => !string.IsNullOrWhiteSpace(t)).ToArray(); return composition; } } diff --git a/docker-compose-generator/src/Program.cs b/docker-compose-generator/src/Program.cs index 39e45bf..9d0d293 100644 --- a/docker-compose-generator/src/Program.cs +++ b/docker-compose-generator/src/Program.cs @@ -94,8 +94,7 @@ namespace DockerGenerator foreach(var fragment in composition.AdditionalFragments) { - if(!string.IsNullOrWhiteSpace(fragment)) - fragments.Add(fragment.Trim()); + fragments.Add(fragment.Trim()); } var def = new DockerComposeDefinition(name, fragments);