Use the right Elasticsearch docker image

exceptionless · Dec 17, 2024 · 2db11fb · 2db11fb
1 parent f91004d
commit 2db11fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/Exceptionless.AppHost/Extensions/ElasticsearchExtensions.cs b/src/Exceptionless.AppHost/Extensions/ElasticsearchExtensions.cs
@@ -55,7 +55,7 @@ public static IResourceBuilder<ElasticsearchResource> AddElasticsearch(this IDis
 
         return builder.AddResource(elasticsearch)
             .WithImage(ElasticsearchContainerImageTags.Image, ElasticsearchContainerImageTags.Tag)
-            .WithImageRegistry(ElasticsearchContainerImageTags.Registry)
+            .WithImageRegistry(ElasticsearchContainerImageTags.ElasticsearchRegistry)
             .WithHttpEndpoint(targetPort: ElasticsearchPort, port: port, name: ElasticsearchResource.PrimaryEndpointName)
             .WithEndpoint(targetPort: ElasticsearchInternalPort, name: ElasticsearchResource.InternalEndpointName)
             .WithEnvironment("discovery.type", "single-node")
@@ -85,7 +85,7 @@ public static IResourceBuilder<ElasticsearchResource> WithKibana(this IResourceB
             var resource = new KibanaResource(containerName);
             var resourceBuilder = builder.ApplicationBuilder.AddResource(resource)
                                       .WithImage(ElasticsearchContainerImageTags.KibanaImage, ElasticsearchContainerImageTags.Tag)
-                                      .WithImageRegistry(ElasticsearchContainerImageTags.Registry)
+                                      .WithImageRegistry(ElasticsearchContainerImageTags.KibanaRegistry)
                                       .WithHttpEndpoint(targetPort: KibanaPort, name: containerName)
                                       .WithEnvironment("xpack.security.enabled", "false")
                                       .ExcludeFromManifest();
@@ -114,8 +114,9 @@ public static IResourceBuilder<ElasticsearchResource> WithDataBindMount(this IRe
 
 internal static class ElasticsearchContainerImageTags
 {
-    public const string Registry = "docker.elastic.co";
-    public const string Image = "elasticsearch/elasticsearch";
+    public const string ElasticsearchRegistry = "docker.io";
+    public const string Image = "exceptionless/elasticsearch";
+    public const string KibanaRegistry = "docker.elastic.co";
     public const string KibanaImage = "kibana/kibana";
     public const string Tag = "8.17.0";
 }
diff --git a/src/Exceptionless.AppHost/Program.cs b/src/Exceptionless.AppHost/Program.cs
@@ -1,7 +1,6 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
 var elastic = builder.AddElasticsearch("Elasticsearch", port: 9200)
-    .WithImageTag("8.17.0")
     .WithLifetime(ContainerLifetime.Persistent)
     .WithContainerName("Exceptionless-Elasticsearch")
     .WithDataVolume("exceptionless.data.v1")

diff --git a/tests/Exceptionless.Tests/AppWebHostFactory.cs b/tests/Exceptionless.Tests/AppWebHostFactory.cs
@@ -24,7 +24,6 @@ public Task InitializeAsync()
 
         builder.AddElasticsearch("Elasticsearch", port: 9200)
             .WithContainerName("Exceptionless-Elasticsearch-Test")
-            .WithImageTag("8.17.0")
             .WithLifetime(ContainerLifetime.Persistent);
 
         _app = builder.Build();