Skip to content

Commit 7e4eb26

Browse files
Jörg Heffnergitgoodjhe
authored andcommitted
Closes #710: Use "docker compose" instead of "docker-compose"
1 parent c794fc5 commit 7e4eb26

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

docker-databases/prepare_db.bat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ SETLOCAL
2121

2222
:START_POSTGRES_14
2323
ECHO ---
24-
ECHO docker-compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
25-
docker-compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
24+
ECHO docker compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
25+
docker compose -f %~dp0/docker-compose.yml up -d taskana-postgres_14
2626

2727
ECHO ---
2828
GOTO MENU
2929

3030
:STOP_POSTGRES_14
3131
ECHO ---
3232
ECHO docker stop taskana-postgres_14
33-
ECHO docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
34-
docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
33+
ECHO docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
34+
docker compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_14
3535
ECHO ---
3636
GOTO MENU
3737

3838
:STOP_ALL
3939
ECHO ---
40-
ECHO docker-compose -f %~dp0/docker-compose.yml down -v
41-
docker-compose -f %~dp0/docker-compose.yml down -v
40+
ECHO docker compose -f %~dp0/docker-compose.yml down -v
41+
docker compose -f %~dp0/docker-compose.yml down -v
4242
ECHO ---
4343
GOTO MENU

docker-databases/prepare_db.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ function main() {
4848
H2)
4949
;;
5050
POSTGRES|POSTGRES_14)
51-
docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
51+
docker compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
5252
;;
5353
stop)
5454
# this variable is necessary, so that the script can terminate properly
5555
# when the provided database name does not match. PLEASE DO NOT INLINE!
5656
local composeServiceName="$(mapDBToDockerComposeServiceName "$2")"
57-
docker-compose -f $scriptDir/docker-compose.yml rm -f -s -v $composeServiceName
57+
docker compose -f $scriptDir/docker-compose.yml rm -f -s -v $composeServiceName
5858
;;
5959
*)
6060
echo "unknown database '$1'" >&2

taskana-adapter-camunda-wildfly-example/src/test/java/pro/taskana/adapter/example/wildfly/AbstractAccTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ private static void startPostgresDb() {
2424
builder.command(
2525
"cmd.exe",
2626
"/c",
27-
"docker-compose -f ../docker-databases/docker-compose.yml up -d "
27+
"docker compose -f ../docker-databases/docker-compose.yml up -d "
2828
+ "taskana-postgres_14");
2929
} else {
3030
builder.command(
3131
"sh",
3232
"-c",
33-
"docker-compose -f ../docker-databases/docker-compose.yml up -d "
33+
"docker compose -f ../docker-databases/docker-compose.yml up -d "
3434
+ "taskana-postgres_14");
3535
}
3636
Process process = builder.start();
@@ -50,10 +50,10 @@ private static void stopPostgresDb() {
5050
ProcessBuilder builder = new ProcessBuilder();
5151
if (isWindows) {
5252
builder.command(
53-
"cmd.exe", "/c", "docker-compose -f ../docker-databases/docker-compose.yml down -v");
53+
"cmd.exe", "/c", "docker compose -f ../docker-databases/docker-compose.yml down -v");
5454
} else {
5555
builder.command(
56-
"sh", "-c", "docker-compose -f ../docker-databases/docker-compose.yml down -v");
56+
"sh", "-c", "docker compose -f ../docker-databases/docker-compose.yml down -v");
5757
}
5858
Process process = builder.start();
5959
LOGGER.info("Stopping POSTGRES...");

0 commit comments

Comments
 (0)