Rename integration test docker and compose files

Author: anderslindho

src/test/java/org/phoebus/channelfinder/docker/ITUtil.java

@@ -75,7 +75,7 @@ public class ITUtil {
     public static final ObjectMapper MAPPER = new ObjectMapper();
 
     public static final String CHANNELFINDER = "channelfinder";
-    public static final String INTEGRATIONTEST_DOCKER_COMPOSE = "src/test/resources/docker-compose-integrationtest.yml";
+    public static final String INTEGRATIONTEST_DOCKER_COMPOSE = "src/test/resources/compose.yml";
 
     // code coverage
 

…est/resources/Dockerfile.integrationtest src/test/resources/Dockerfilesrc/test/resources/Dockerfile.integrationtest renamed to src/test/resources/Dockerfile src/test/resources/Dockerfile.integrationtest renamed to src/test/resources/Dockerfile

@@ -73,12 +73,12 @@ mvn clean install test-compile failsafe:integration-test failsafe:verify --batch
 ##### Build
 
 * (Re) Build after change in `src/main/java` in order for change to be tested
-* `Dockerfile.integrationtest` relies on built code and not on Maven central
+* `Dockerfile` relies on built code and not on Maven central
 * Requires a deployable jar
 
 ##### Configuration
 
-* Configuration in folder `src/test/java` and package `org.phoebus.channelfinder.docker`, e.g. urls and port numbers, is coupled to files `src/test/resources/Dockerfile.integrationtest` and `src/test/resources/docker-compose-integrationtest.yml` (beside `src/main/resources/application.properties`)
+* Configuration in folder `src/test/java` and package `org.phoebus.channelfinder.docker`, e.g. urls and port numbers, is coupled to files `src/test/resources/Dockerfile` and `src/test/resources/compose.yml` (beside `src/main/resources/application.properties`)
 
 ##### Debug
 

src/test/resources/INTEGRATIONTEST_DOCKER_RUN.md

@@ -33,8 +33,8 @@ It is possible to test ChannelFinder API by running ChannelFinder and Elasticsea
 ##### Files
 
 * folder `src/test/java` and package `org.phoebus.channelfinder.docker`
-* [docker-compose-integrationtest.yml](src/test/resources/docker-compose-integrationtest.yml)
-* [Dockerfile.integrationtest](src/test/resources/Dockerfile.integrationtest)
+* [compose.yml](src/test/resources/compose.yml)
+* [Dockerfile](src/test/resources/Dockerfile)
 
 ### Examples
 
@@ -87,7 +87,7 @@ How
 
 ### How it works - big picture
 
-Integration tests are implemented in test class annotated with `@Testcontainers`. Test class starts a docker container for the application (ChannelFinder service) and another docker container for elastic (Elasticsearch) through `src/test/resources/docker-compose-integrationtest.yml` and `src/test/resources/Dockerfile.integrationtest` after which JUnit tests are run.
+Integration tests are implemented in test class annotated with `@Testcontainers`. Test class starts a docker container for the application (ChannelFinder service) and another docker container for elastic (Elasticsearch) through `src/test/resources/compose.yml` and `src/test/resources/Dockerfile` after which JUnit tests are run.
 
 ```
 @Testcontainers
@@ -320,8 +320,8 @@ public class ChannelFinderChannelsIT {
 
 ##### Note
 
-* (Re) Build after change in `src/main/java` is needed in order for change to be tested as `Dockerfile.integrationtest` relies on built code.
-* Configuration in folder `src/test/java` and package `org.phoebus.channelfinder.docker`, e.g. urls and port numbers, is coupled to files `src/test/resources/Dockerfile.integrationtest` and `src/test/resources/docker-compose-integrationtest.yml` (beside `src/main/resources/application.properties`).
+* (Re) Build after change in `src/main/java` is needed in order for change to be tested as `Dockerfile` relies on built code.
+* Configuration in folder `src/test/java` and package `org.phoebus.channelfinder.docker`, e.g. urls and port numbers, is coupled to files `src/test/resources/Dockerfile` and `src/test/resources/compose.yml` (beside `src/main/resources/application.properties`).
 * Both positive and negative tests are important to ensure validation works as expected.
 
 ### How to run

src/test/resources/INTEGRATIONTEST_DOCKER_TUTORIAL.md

@@ -18,9 +18,7 @@
 
 services:
   channelfinder:
-    build: 
-      context: .
-      dockerfile: Dockerfile.integrationtest
+    build: .
     hostname: channelfinder
     networks:
       - channelfinder-net