Closes #2638: Use "docker compose" instead of "docker-compose"

Taskana · Aug 6, 2024 · 611a735 · 611a735
1 parent fef135a
commit 611a735
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 34 deletions.
diff --git a/docker-databases/docker-compose.yml b/docker-databases/docker-compose.yml
@@ -3,15 +3,15 @@ services:
   taskana-postgres_14:
     build: postgres_14
     ports:
-      - 5102:5432
+      - "5102:5432"
     environment:
       - POSTGRES_PASSWORD=postgres
   taskana-db2_11-5:
     image: taskana/db2:11.5
     environment:
       - LICENSE=accept
     ports:
-      - 5101:50000
+      - "5101:50000"
   taskana-oracle-18:
     image: gvenzl/oracle-xe:18-slim-faststart
     environment:
@@ -21,4 +21,4 @@ services:
       - APP_USER_PASSWORD=testPassword
       - TZ=Europe/Berlin
     ports:
-      - 5103:1521
+      - "5103:1521"
diff --git a/docker-databases/prepare_db.bat b/docker-databases/prepare_db.bat
@@ -31,54 +31,54 @@ SETLOCAL
 
 :START_DB2_11_5
     ECHO ---
-    ECHO docker-compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
-    docker-compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
+    ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
+    docker compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
 
     ECHO ---
     GOTO MENU
 
 :STOP_DB2_11_5
     ECHO ---
-    ECHO docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
-    docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
+    ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
+    docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
     ECHO ---
     GOTO MENU
 
 :START_POSTGRES_14
     ECHO ---
-    ECHO docker-compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
-    docker-compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
+    ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
+    docker compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
 
     ECHO ---
     GOTO MENU
 
 :STOP_POSTGRES_14
     ECHO ---
     ECHO docker stop taskana-postgres_14
-    ECHO docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
-    docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
+    ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
+    docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
     ECHO ---
     GOTO MENU
 
 :START_ORACLE_18
     ECHO ---
-    ECHO docker-compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
-    docker-compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
+    ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
+    docker compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
 
     ECHO ---
     GOTO MENU
 
 :STOP_ORACLE_18
     ECHO ---
     ECHO docker stop taskana-oracle-18
-    ECHO docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
-    docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
+    ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
+    docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
     ECHO ---
     GOTO MENU
 
 :STOP_ALL
     ECHO ---
-    ECHO docker-compose -f %~dp0/docker-compose.yml down -v
-    docker-compose -f %~dp0/docker-compose.yml down -v
+    ECHO docker compose -f %~dp0/docker-compose.yml down -v
+    docker compose -f %~dp0/docker-compose.yml down -v
     ECHO ---
     GOTO MENU
diff --git a/docker-databases/prepare_db.sh b/docker-databases/prepare_db.sh
@@ -28,7 +28,7 @@ function helpAndExit() {
   exit "$1"
 }
 
-# This function maps the database parameter (for this file) to the docker-compose service name.
+# This function maps the database parameter (for this file) to the docker compose service name.
 # Arguments:
 #   $1: the database which should be mapped
 function mapDBToDockerComposeServiceName() {
@@ -56,19 +56,19 @@ function main() {
   H2)
     ;;
   DB2|DB2_11_5)
-    docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
+    docker compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
     ;;
   POSTGRES|POSTGRES_14)
-    docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
+    docker compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
     ;;
   ORACLE|ORACLE_18)
-    docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
+    docker compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
     ;;
   stop)
     # this variable is necessary, so that the script can terminate properly
     # when the provided database name does not match. PLEASE DO NOT INLINE!
     local composeServiceName="$(mapDBToDockerComposeServiceName "$2")"
-    docker-compose -f $scriptDir/docker-compose.yml rm -f -s -v $composeServiceName
+    docker compose -f $scriptDir/docker-compose.yml rm -f -s -v $composeServiceName
     ;;
   *)
     echo "unknown database '$1'" >&2

diff --git a/...est-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java b/...est-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java
@@ -3,6 +3,7 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;
@@ -95,17 +96,14 @@ private static void stopPostgresDb() {
       ProcessBuilder builder = new ProcessBuilder();
       if (isWindows) {
         builder.command(
-            "cmd.exe", "/c", "docker-compose -f ../../docker-databases/docker-compose.yml down -v");
+            "cmd.exe", "/c", "docker compose -f ../../docker-databases/docker-compose.yml down -v");
       } else {
         builder.command(
-            "sh", "-c", "docker-compose -f ../../docker-databases/docker-compose.yml down -v");
+            "sh", "-c", "docker compose -f ../../docker-databases/docker-compose.yml down -v");
       }
       Process process = builder.start();
       LOGGER.info("Stopping POSTGRES...");
-      int exitCode = process.waitFor();
-      if (exitCode != 0) {
-        throw new RuntimeException("could not start postgres db!");
-      }
+      assertSuccessExitCode(process);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -119,23 +117,35 @@ private static void startPostgresDb() {
         builder.command(
             "cmd.exe",
             "/c",
-            "docker-compose -f ../../docker-databases/docker-compose.yml up -d "
+            "docker compose -f ../../docker-databases/docker-compose.yml up -d "
                 + "taskana-postgres_14");
       } else {
         builder.command(
             "sh",
             "-c",
-            "docker-compose -f ../../docker-databases/docker-compose.yml up -d "
+            "docker compose -f ../../docker-databases/docker-compose.yml up -d "
                 + "taskana-postgres_14");
       }
       Process process = builder.start();
       LOGGER.info("Starting POSTGRES...");
-      int exitCode = process.waitFor();
-      if (exitCode != 0) {
-        throw new RuntimeException("could not start postgres db!");
-      }
+      assertSuccessExitCode(process);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
   }
+
+  private static void assertSuccessExitCode(Process process) throws InterruptedException {
+    int exitCode = process.waitFor();
+    if (exitCode != 0) {
+      String standardOutput = process.inputReader().lines().collect(Collectors.joining("\n"));
+      String standardError = process.errorReader().lines().collect(Collectors.joining("\n"));
+      throw new RuntimeException(
+          "Could not start postgres db! exit code: "
+              + exitCode
+              + ", standardOutput: "
+              + standardOutput
+              + ", standardError: "
+              + standardError);
+    }
+  }
 }