Doh! Only run this selection menu if its actually a compose build.. (#…

…169)
prom3theu5 · May 1, 2024 · 7f3759a · 7f3759a
1 parent 19d206f
commit 7f3759a
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/src/Aspirate.Commands/Actions/Containers/BuildAndPushContainersFromDockerfilesAction.cs b/src/Aspirate.Commands/Actions/Containers/BuildAndPushContainersFromDockerfilesAction.cs
@@ -12,19 +12,7 @@ public override async Task<bool> ExecuteAsync()
             return true;
         }
 
-        if (CurrentState.ComposeBuilds?.Any() == false)
-        {
-            SelectComposeItemsToIncludeAsComposeBuilds();
-        }
-
-        if (CurrentState.ComposeBuilds?.Any() == true)
-        {
-            Logger.MarkupLine("[bold]Compose builds selected:[/]");
-            foreach (var composeBuild in CurrentState.ComposeBuilds)
-            {
-                Logger.MarkupLine($"[blue] - {composeBuild}[/]");
-            }
-        }
+        HandleComposeOutputBuildSelectionForDockerfiles();
 
         var dockerfileProcessor = Services.GetRequiredKeyedService<IResourceProcessor>(AspireComponentLiterals.Dockerfile) as DockerfileProcessor;
 
@@ -41,6 +29,28 @@ public override async Task<bool> ExecuteAsync()
         return true;
     }
 
+    private void HandleComposeOutputBuildSelectionForDockerfiles()
+    {
+        if (string.IsNullOrEmpty(CurrentState.OutputFormat) || OutputFormat.FromValue(CurrentState.OutputFormat) != OutputFormat.DockerCompose)
+        {
+            return;
+        }
+
+        if (CurrentState.ComposeBuilds?.Any() == false)
+        {
+            SelectComposeItemsToIncludeAsComposeBuilds();
+        }
+
+        if (CurrentState.ComposeBuilds?.Any() == true)
+        {
+            Logger.MarkupLine("[bold]Compose builds selected:[/]");
+            foreach (var composeBuild in CurrentState.ComposeBuilds)
+            {
+                Logger.MarkupLine($"[blue] - {composeBuild}[/]");
+            }
+        }
+    }
+
     private void CacheContainerDetails(DockerfileProcessor? dockerfileProcessor)
     {
         foreach (var resource in CurrentState.SelectedDockerfileComponents.Where(resource => CurrentState.ComposeBuilds?.Contains(resource.Key) != true))
@@ -129,7 +139,7 @@ private bool HasSelectedDockerfileComponents()
 
     public override void ValidateNonInteractiveState()
     {
-        if (!CurrentState.NonInteractive || !HasSelectedDockerfileComponents())
+        if (!CurrentState.NonInteractive || !HasSelectedDockerfileComponents() || OutputFormat.FromValue(CurrentState.OutputFormat) != OutputFormat.DockerCompose)
         {
             return;
         }