remove the additional arm64 Docker Compose file (#158)

README.md

@@ -146,8 +146,6 @@ OS name: "linux", version: "5.4.0-92-generic", arch: "amd64", family: "unix"
 
 ## Running the Project Locally
 
-*When trying to run the application and the tests on an ARM64 processor, there's a [small tweak](https://github.com/rieckpil/testing-spring-boot-applications-masterclass/issues/31) required.*
-
 Assuming your local setups meets all requirements as stated above, you can now start the application:
 
 1. Make sure your Docker Engine is up- and running
@@ -209,7 +207,7 @@ version: '3.8'
 services:
   # ...
   keycloak:
-    image: jboss/keycloak:16.1.0
+    image: quay.io/keycloak/keycloak:18.0.0-legacy
     environment:
       - KEYCLOAK_USER=keycloak
       - KEYCLOAK_PASSWORD=keycloak

docker-compose.yml

@@ -8,7 +8,7 @@ services:
     ports:
       - "5432:5432"
   keycloak:
-    image: jboss/keycloak:16.1.0
+    image: quay.io/keycloak/keycloak:18.0.0-legacy
     environment:
       - KEYCLOAK_USER=keycloak
       - KEYCLOAK_PASSWORD=keycloak
@@ -21,8 +21,14 @@ services:
         read_only: true
     ports:
     - "8888:8080"
+  # Drop-in replacement for the previous roribio16/alpine-sqs:latest (no arm64 support)
   sqs:
-    image: roribio16/alpine-sqs:latest
+    image: softwaremill/elasticmq-native
+    volumes:
+      - type: bind
+        source: ./tmp/sqs-queue-definition.conf
+        target: /opt/elasticmq.conf
+        read_only: true
     ports:
       - "9324:9324"
       - "9325:9325"

src/test/java/de/rieckpil/courses/AbstractWebTest.java

@@ -32,7 +32,7 @@ public abstract class AbstractWebTest {
   protected static Logger LOG = LoggerFactory.getLogger(AbstractWebTest.class);
 
   public static DockerComposeContainer<?> environment =
-    new DockerComposeContainer<>(new File(System.getProperty("os.arch").equals("aarch64") ? "docker-compose-arm64-support.yml" : "docker-compose.yml"))
+    new DockerComposeContainer<>(new File("docker-compose.yml"))
       .withExposedService("database_1", 5432, Wait.forListeningPort())
       .withExposedService("keycloak_1", 8080, Wait.forHttp("/auth").forStatusCode(200)
         .withStartupTimeout(Duration.ofSeconds(45)))