Add support for GitHub Container Registry image push in the pipeline; update .editorconfig and add CliWrap dependency

Author: davidfowl

.editorconfig

@@ -8,3 +8,6 @@ dotnet_diagnostic.ASPIREPROXYENDPOINTS001.severity = none
 
 # ASPIREAZURE001: Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 dotnet_diagnostic.ASPIREAZURE001.severity = none
+
+# ASPIREPIPELINES001: Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+dotnet_diagnostic.ASPIREPIPELINES001.severity = silent

.github/workflows/aspire-publish.yml

@@ -26,37 +26,11 @@ jobs:
     - name: Install Aspire CLI
       run: dotnet tool install --global aspire.cli
 
-    - name: Run Aspire Do Build
-      run: aspire do build
-      working-directory: AIChat.AppHost
-
     - name: Log in to GitHub Container Registry
       run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-    - name: Query, Tag and Push Container Images
-      run: |
-        BUILD_NUMBER=${{ github.run_number }}
-        BRANCH_NAME=${{ github.ref_name }}
-        SANITIZED_BRANCH_NAME=$(echo "$BRANCH_NAME" | sed 's#[^a-zA-Z0-9._-]#-#g')
-        
-        # Query docker images and find the latest chatapi and chatui images (most recently built)
-        CHATAPI_IMAGE=$(docker images --format "{{.CreatedAt}}\t{{.Repository}}:{{.Tag}}" | grep -E $'^\t[^/]*chatapi:' | sort -r | head -n 1 | awk '{print $NF}')
-        CHATUI_IMAGE=$(docker images --format "{{.CreatedAt}}\t{{.Repository}}:{{.Tag}}" | grep -E $'^\t[^/]*chatui:' | sort -r | head -n 1 | awk '{print $NF}')
-        
-        # Tag and push chatapi if found
-        if [ -n "$CHATAPI_IMAGE" ]; then
-          echo "Found chatapi image: $CHATAPI_IMAGE"
-          docker tag $CHATAPI_IMAGE ghcr.io/${{ github.repository_owner }}/chatapi:${SANITIZED_BRANCH_NAME}-${BUILD_NUMBER}
-          docker push ghcr.io/${{ github.repository_owner }}/chatapi:${SANITIZED_BRANCH_NAME}-${BUILD_NUMBER}
-        else
-          echo "Warning: No chatapi image found"
-        fi
-        
-        # Tag and push chatui if found
-        if [ -n "$CHATUI_IMAGE" ]; then
-          echo "Found chatui image: $CHATUI_IMAGE"
-          docker tag $CHATUI_IMAGE ghcr.io/${{ github.repository_owner }}/chatui:${SANITIZED_BRANCH_NAME}-${BUILD_NUMBER}
-          docker push ghcr.io/${{ github.repository_owner }}/chatui:${SANITIZED_BRANCH_NAME}-${BUILD_NUMBER}
-        else
-          echo "Warning: No chatui image found"
-        fi
+    - name: Push to GitHub Container Registry
+      run: aspire do push-gh
+      env:
+        GHCR_REPO: ghcr.io/${{ github.repository_owner }}
+        TAG_SUFFIX: ${{ github.run_number }}

AIChat.AppHost/AIChat.AppHost.csproj

@@ -17,6 +17,7 @@
     <PackageReference Include="Aspire.Hosting.JavaScript" Version="13.0.0" />
     <PackageReference Include="Aspire.Hosting.Yarp" Version="13.0.0" />
     <PackageReference Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.9.0" />
+    <PackageReference Include="CliWrap" Version="3.6.7" />
   </ItemGroup>
 
   <ItemGroup>

AIChat.AppHost/Program.cs

@@ -1,3 +1,7 @@
+using Aspire.Hosting.Pipelines;
+using CliWrap;
+using Microsoft.Extensions.Logging;
+
 var builder = DistributedApplication.CreateBuilder(args);
 
 // Publish this as a Docker Compose application
@@ -67,7 +71,7 @@
                       .WithUrl("", "Chat UI");
 
 // We use YARP as the static file server and reverse proxy.
-builder.AddYarp("chatui")
+var yarp =builder.AddYarp("chatui")
        .WithExternalHttpEndpoints()
        .PublishWithStaticFiles(frontend)
        .WithConfiguration(c =>
@@ -76,5 +80,52 @@
        })
        .WithExplicitStart();
 
-builder.Build().Run();
+// Add a push to GitHub Container Registry step
+// that will be executed from the pipeline
+builder.Pipeline.AddStep("push-gh", async context =>
+{
+    // Get configuration values
+    var ghcrRepo = builder.Configuration["GHCR_REPO"] ?? throw new InvalidOperationException("GHCR_REPO environment variable is required");
+    var tagSuffix = builder.Configuration["TAG_SUFFIX"] ?? "latest";
+    
+    var resourcesToPublish = new (IResource resource, string imageName)[] 
+    { 
+        (chatapi.Resource, "chatapi"),
+        (yarp.Resource, "chatui")
+    };
 
+    foreach (var (resource, imageName) in resourcesToPublish)
+    {
+        // For project resources, use hardcoded "latest" tag
+        var localImageName = resource is ProjectResource ? $"{imageName}:latest" : null;
+        
+        if (localImageName is null && !resource.TryGetContainerImageName(out localImageName))
+        {
+            context.Logger.LogWarning("{ImageName} image name not found, skipping", imageName);
+            continue;
+        }
+
+        var remoteTag = $"{ghcrRepo}/{imageName}:{tagSuffix}";
+        
+        context.Logger.LogInformation("Tagging {LocalImage} as {RemoteTag}", localImageName, remoteTag);
+        
+        // Tag the image
+        await Cli.Wrap("docker")
+            .WithArguments(["tag", localImageName, remoteTag])
+            .WithStandardOutputPipe(PipeTarget.ToDelegate(line => context.Logger.LogDebug("{Output}", line)))
+            .WithStandardErrorPipe(PipeTarget.ToDelegate(line => context.Logger.LogError("{Error}", line)))
+            .ExecuteAsync();
+        
+        context.Logger.LogInformation("Pushing {RemoteTag}", remoteTag);
+        
+        // Push the image
+        await Cli.Wrap("docker")
+            .WithArguments(["push", remoteTag])
+            .WithStandardOutputPipe(PipeTarget.ToDelegate(line => context.Logger.LogDebug("{Output}", line)))
+            .WithStandardErrorPipe(PipeTarget.ToDelegate(line => context.Logger.LogError("{Error}", line)))
+            .ExecuteAsync();
+    }
+}, 
+dependsOn: WellKnownPipelineSteps.Build);
+
+builder.Build().Run();