- Updated AddTemporalServerContainer to use temporalio/admin-tools image and set entry point to "temporal".

Author: ElanHasson

src/InfinityFlow.Aspire.Temporal/InfinityFlow.Aspire.Temporal.csproj

@@ -30,7 +30,5 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
-    <PackageReference Include="Docker.DotNet" Version="3.125.15" />
-    <PackageReference Include="Testcontainers" Version="4.3.0" />
   </ItemGroup>
 </Project>

src/InfinityFlow.Aspire.Temporal/TemporalServerContainerBuilderExtensions.cs

@@ -1,5 +1,5 @@
 using Aspire.Hosting.ApplicationModel;
-using DotNet.Testcontainers.Builders;
+
 using InfinityFlow.Aspire.Temporal;
 
 namespace Aspire.Hosting;
@@ -32,52 +32,14 @@ public static Task<IResourceBuilder<TemporalServerContainerResource>> AddTempora
     {
         return builder.AddTemporalServerContainer(name, new TemporalServerResourceArguments());
     }
-
-    const string Dockerfile = """
-    # Define the build stage
-    FROM alpine as builder
-
-    # Install curl and tar
-    RUN apk add --no-cache curl tar
-
-    # Set build arguments for URL, defaulting ARCH to amd64
-    ARG ARCH=amd64
-    ARG URL="https://temporal.download/cli/archive/latest?platform=linux"
-
-    # Download the binary based on the architecture
-    RUN curl -L "${URL}&arch=${ARCH}" -o temporal.tar.gz
-
-    # Extract the archive
-    RUN tar -xzf temporal.tar.gz -C /tmp
-    RUN mv /tmp/temporal /temporal
-
-    # Ensure the binary is executable
-    RUN chmod +x /temporal
-
-    # Define the final stage based on a scratch image for minimal size
-    FROM alpine
-
-    # Copy the binary from the builder stage
-    COPY --from=builder /temporal /temporal
-
-    EXPOSE 7233
-    EXPOSE 8233
-    EXPOSE 7235
-    EXPOSE 7234
-
-    # Set the entrypoint to the downloaded binary
-    ENTRYPOINT ["/temporal"]
-    """;
-
     private static async Task<IResourceBuilder<TemporalServerContainerResource>> AddTemporalServerContainer(this IDistributedApplicationBuilder builder, string name, TemporalServerResourceArguments args)
     {
-        await BuildAspireHelperContainer();
-
         var container = new TemporalServerContainerResource(name, args);
 
         var resourceBuilder = builder.AddResource(container)
-                .WithAnnotation(new ContainerImageAnnotation() { Image = "aspire-temporal-server-helper", Tag = "latest" })
+                .WithAnnotation(new ContainerImageAnnotation() { Image = "temporalio/admin-tools", Tag = "latest" })
                 .WithArgs(args.GetArgs())
+                .WithEntrypoint("temporal")
                 .WithHttpsEndpoint(name: "server", port: args.Port, targetPort: 7233).AsHttp2Service(); // Internal port is always 7233
 
         if (args.Headless is not true)
@@ -97,36 +59,4 @@ private static async Task<IResourceBuilder<TemporalServerContainerResource>> Add
 
         return resourceBuilder;
     }
-
-    private static async Task BuildAspireHelperContainer()
-    {
-        string tempDir = string.Empty;
-        try
-        {
-            tempDir = Directory.CreateTempSubdirectory("aspire-temporal-server").FullName;
-            var dockerFileTemp = Path.Join(tempDir, "Dockerfile");
-
-            await File.WriteAllTextAsync(dockerFileTemp, Dockerfile);
-
-            await using var futureImage = new ImageFromDockerfileBuilder()
-                 .WithDockerfileDirectory(tempDir)
-                 .WithDeleteIfExists(false)
-                 .WithBuildArgument("ARCH", System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture switch
-                 {
-                     System.Runtime.InteropServices.Architecture.X64 => "amd64",
-                     System.Runtime.InteropServices.Architecture.Arm64 => "arm64",
-                     _ => throw new NotImplementedException($"Unsupported CPU Architecture: {System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture}")
-                 })
-                 .WithBuildArgument("URL", "https://temporal.download/cli/archive/latest?platform=linux")
-                 .WithName("aspire-temporal-server-helper:latest")
-                 .WithDockerfile("Dockerfile")
-                 .Build();
-
-            await futureImage.CreateAsync();
-        }
-        finally
-        {
-            Directory.Delete(tempDir, true);
-        }
-    }
 }