fix: build failed when run with elasticsearch image in integration tests

Author: psmagin

.github/workflows/elasticsearch.yml

@@ -11,20 +11,32 @@ jobs:
     env:
       ELASTICSEARCH_SERVER: true
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
           cache: 'maven'
-      - run: export SEARCH_ENGINE_DOCKERFILE="docker/elasticsearch8/Dockerfile"; mvn clean install
+      - name: Cache Maven packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-maven
+      - run: export SEARCH_ENGINE_DOCKERFILE="docker/elasticsearch8/Dockerfile" && mvn clean install
   opensearch2:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
           cache: 'maven'
-      - run: export SEARCH_ENGINE_DOCKERFILE="docker/opensearch2/Dockerfile"; mvn clean install
+      - name: Cache Maven packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-maven
+      - run: export SEARCH_ENGINE_DOCKERFILE="docker/opensearch2/Dockerfile" && mvn clean install

pom.xml

@@ -309,6 +309,20 @@
       <version>${folio-spring-support.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers-elasticsearch</artifactId>
+      <version>2.0.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opensearch</groupId>
+      <artifactId>opensearch-testcontainers</artifactId>
+      <version>4.1.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <pluginRepositories>

src/test/java/org/folio/support/extension/impl/ElasticSearchContainerExtension.java

@@ -5,8 +5,11 @@
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.opensearch.testcontainers.OpenSearchContainer;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
+import org.testcontainers.utility.DockerImageName;
 
 @Log4j2
 public class ElasticSearchContainerExtension implements BeforeAllCallback, AfterAllCallback {
@@ -30,6 +33,19 @@ public void afterAll(ExtensionContext context) {
     System.clearProperty(SPRING_PROPERTY_NAME);
   }
 
+  private static GenericContainer<?> buildSearchContainer(String dockerfile, String imageTag) {
+    if (dockerfile.contains("opensearch")) {
+      return new OpenSearchContainer<>(
+        DockerImageName.parse(imageTag)
+          .asCompatibleSubstituteFor("opensearchproject/opensearch"));
+    } else {
+      return new ElasticsearchContainer(
+        DockerImageName.parse(imageTag)
+          .asCompatibleSubstituteFor("docker.elastic.co/elasticsearch/elasticsearch"))
+        .withEnv("xpack.security.enabled", "false");
+    }
+  }
+
   private String getSearchUrl() {
     return "http://" + CONTAINER.getHost() + ":" + CONTAINER.getMappedPort(9200);
   }
@@ -38,26 +54,20 @@ private static GenericContainer<?> createContainer() {
     var dockerfile = System.getenv().getOrDefault("SEARCH_ENGINE_DOCKERFILE", DEFAULT_DOCKERFILE);
     log.info("search engine dockerfile: {}", dockerfile);
 
-    // Verify dockerfile exists
     Path dockerfilePath = Path.of(dockerfile);
     if (!dockerfilePath.toFile().exists()) {
       throw new RuntimeException("Dockerfile not found at: " + dockerfile);
     }
 
-    try {
-      var container = new GenericContainer<>(new ImageFromDockerfile(IMAGE_NAME, false)
-        .withDockerfile(dockerfilePath))
-        .withEnv("discovery.type", "single-node")
-        .withExposedPorts(9200);
-      if (dockerfile.contains("opensearch")) {
-        container.withEnv("DISABLE_SECURITY_PLUGIN", "true");
-      } else {  // elasticsearch
-        container.withEnv("xpack.security.enabled", "false");
-      }
-      return container;
-    } catch (Exception e) {
-      log.error("Failed to create container with dockerfile: {}", dockerfile, e);
-      throw e;
-    }
+    String imageTag = buildImage(dockerfilePath);
+    return buildSearchContainer(dockerfile, imageTag);
+  }
+
+  private static String buildImage(Path dockerfilePath) {
+    new ImageFromDockerfile(IMAGE_NAME, false)
+      .withDockerfile(dockerfilePath)
+      .get();
+    return IMAGE_NAME + ":latest";
   }
 }
+