Skip to content

Commit 3646bc0

Browse files
CRoberto1926gitgoodjhe
CRoberto1926
authored and
gitgoodjhe
committed
Closes #2638: Use "docker compose" instead of "docker-compose"
1 parent af83e06 commit 3646bc0

File tree

4 files changed

+44
-34
lines changed

4 files changed

+44
-34
lines changed

‎docker-databases/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ services:
33
taskana-postgres_14:
44
build: postgres_14
55
ports:
6-
- 5102:5432
6+
- "5102:5432"
77
environment:
88
- POSTGRES_PASSWORD=postgres
99
taskana-db2_11-5:
1010
image: taskana/db2:11.5
1111
environment:
1212
- LICENSE=accept
1313
ports:
14-
- 5101:50000
14+
- "5101:50000"
1515
taskana-oracle-18:
1616
image: gvenzl/oracle-xe:18-slim-faststart
1717
environment:
@@ -21,4 +21,4 @@ services:
2121
- APP_USER_PASSWORD=testPassword
2222
- TZ=Europe/Berlin
2323
ports:
24-
- 5103:1521
24+
- "5103:1521"

‎docker-databases/prepare_db.bat

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,54 +31,54 @@ SETLOCAL
3131

3232
:START_DB2_11_5
3333
ECHO ---
34-
ECHO docker-compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
35-
docker-compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
34+
ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
35+
docker compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
3636

3737
ECHO ---
3838
GOTO MENU
3939

4040
:STOP_DB2_11_5
4141
ECHO ---
42-
ECHO docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
43-
docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
42+
ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
43+
docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
4444
ECHO ---
4545
GOTO MENU
4646

4747
:START_POSTGRES_14
4848
ECHO ---
49-
ECHO docker-compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
50-
docker-compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
49+
ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
50+
docker compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
5151

5252
ECHO ---
5353
GOTO MENU
5454

5555
:STOP_POSTGRES_14
5656
ECHO ---
5757
ECHO docker stop taskana-postgres_14
58-
ECHO docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
59-
docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
58+
ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
59+
docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
6060
ECHO ---
6161
GOTO MENU
6262

6363
:START_ORACLE_18
6464
ECHO ---
65-
ECHO docker-compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
66-
docker-compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
65+
ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
66+
docker compose -f %~dp0/docker-compose.yml up -d taskana-oracle-18
6767

6868
ECHO ---
6969
GOTO MENU
7070

7171
:STOP_ORACLE_18
7272
ECHO ---
7373
ECHO docker stop taskana-oracle-18
74-
ECHO docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
75-
docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
74+
ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
75+
docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-oracle-18
7676
ECHO ---
7777
GOTO MENU
7878

7979
:STOP_ALL
8080
ECHO ---
81-
ECHO docker-compose -f %~dp0/docker-compose.yml down -v
82-
docker-compose -f %~dp0/docker-compose.yml down -v
81+
ECHO docker compose -f %~dp0/docker-compose.yml down -v
82+
docker compose -f %~dp0/docker-compose.yml down -v
8383
ECHO ---
8484
GOTO MENU

‎docker-databases/prepare_db.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function helpAndExit() {
2828
exit "$1"
2929
}
3030

31-
# This function maps the database parameter (for this file) to the docker-compose service name.
31+
# This function maps the database parameter (for this file) to the docker compose service name.
3232
# Arguments:
3333
# $1: the database which should be mapped
3434
function mapDBToDockerComposeServiceName() {
@@ -56,19 +56,19 @@ function main() {
5656
H2)
5757
;;
5858
DB2|DB2_11_5)
59-
docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
59+
docker compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
6060
;;
6161
POSTGRES|POSTGRES_14)
62-
docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
62+
docker compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
6363
;;
6464
ORACLE|ORACLE_18)
65-
docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
65+
docker compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
6666
;;
6767
stop)
6868
# this variable is necessary, so that the script can terminate properly
6969
# when the provided database name does not match. PLEASE DO NOT INLINE!
7070
local composeServiceName="$(mapDBToDockerComposeServiceName "$2")"
71-
docker-compose -f $scriptDir/docker-compose.yml rm -f -s -v $composeServiceName
71+
docker compose -f $scriptDir/docker-compose.yml rm -f -s -v $composeServiceName
7272
;;
7373
*)
7474
echo "unknown database '$1'" >&2

‎rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.BufferedReader;
44
import java.io.File;
55
import java.io.FileReader;
6+
import java.util.stream.Collectors;
67
import org.slf4j.Logger;
78
import org.slf4j.LoggerFactory;
89
import org.springframework.core.ParameterizedTypeReference;
@@ -95,17 +96,14 @@ private static void stopPostgresDb() {
9596
ProcessBuilder builder = new ProcessBuilder();
9697
if (isWindows) {
9798
builder.command(
98-
"cmd.exe", "/c", "docker-compose -f ../../docker-databases/docker-compose.yml down -v");
99+
"cmd.exe", "/c", "docker compose -f ../../docker-databases/docker-compose.yml down -v");
99100
} else {
100101
builder.command(
101-
"sh", "-c", "docker-compose -f ../../docker-databases/docker-compose.yml down -v");
102+
"sh", "-c", "docker compose -f ../../docker-databases/docker-compose.yml down -v");
102103
}
103104
Process process = builder.start();
104105
LOGGER.info("Stopping POSTGRES...");
105-
int exitCode = process.waitFor();
106-
if (exitCode != 0) {
107-
throw new RuntimeException("could not start postgres db!");
108-
}
106+
assertSuccessExitCode(process);
109107
} catch (Exception e) {
110108
throw new RuntimeException(e);
111109
}
@@ -119,23 +117,35 @@ private static void startPostgresDb() {
119117
builder.command(
120118
"cmd.exe",
121119
"/c",
122-
"docker-compose -f ../../docker-databases/docker-compose.yml up -d "
120+
"docker compose -f ../../docker-databases/docker-compose.yml up -d "
123121
+ "taskana-postgres_14");
124122
} else {
125123
builder.command(
126124
"sh",
127125
"-c",
128-
"docker-compose -f ../../docker-databases/docker-compose.yml up -d "
126+
"docker compose -f ../../docker-databases/docker-compose.yml up -d "
129127
+ "taskana-postgres_14");
130128
}
131129
Process process = builder.start();
132130
LOGGER.info("Starting POSTGRES...");
133-
int exitCode = process.waitFor();
134-
if (exitCode != 0) {
135-
throw new RuntimeException("could not start postgres db!");
136-
}
131+
assertSuccessExitCode(process);
137132
} catch (Exception e) {
138133
throw new RuntimeException(e);
139134
}
140135
}
136+
137+
private static void assertSuccessExitCode(Process process) throws InterruptedException {
138+
int exitCode = process.waitFor();
139+
if (exitCode != 0) {
140+
String standardOutput = process.inputReader().lines().collect(Collectors.joining("\n"));
141+
String standardError = process.errorReader().lines().collect(Collectors.joining("\n"));
142+
throw new RuntimeException(
143+
"Could not start postgres db! exit code: "
144+
+ exitCode
145+
+ ", standardOutput: "
146+
+ standardOutput
147+
+ ", standardError: "
148+
+ standardError);
149+
}
150+
}
141151
}

0 commit comments

Comments
 (0)