From aabad50e348b78ffab54c7e4b994ec66ede2bbdc Mon Sep 17 00:00:00 2001 From: Alberto Codutti Date: Thu, 1 Aug 2024 10:32:43 +0200 Subject: [PATCH] :sparkles: [Docker] Migrated to Docker Compose V2 Signed-off-by: Alberto Codutti --- deployment/docker/unix/docker-deploy.sh | 4 ++-- deployment/docker/unix/docker-logs.sh | 2 +- deployment/docker/unix/docker-undeploy.sh | 2 +- deployment/docker/win/docker-deploy.ps1 | 6 +++--- deployment/docker/win/docker-logs.ps1 | 2 +- deployment/docker/win/docker-undeploy.ps1 | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deployment/docker/unix/docker-deploy.sh b/deployment/docker/unix/docker-deploy.sh index 2b691fb27f2..738f1a3520a 100755 --- a/deployment/docker/unix/docker-deploy.sh +++ b/deployment/docker/unix/docker-deploy.sh @@ -80,7 +80,7 @@ docker_compose() { fi export KAPUA_SWAGGER_ENABLE=$6 - docker-compose -f "${SCRIPT_DIR}/../compose/docker-compose.yml" "${COMPOSE_FILES[@]}" up -d + docker compose -f "${SCRIPT_DIR}/../compose/docker-compose.yml" "${COMPOSE_FILES[@]}" up -d } print_usage_deploy() { @@ -148,5 +148,5 @@ echo "Deploying Eclipse Kapua... DONE!" if [[ ${OPEN_LOGS} == true ]]; then . "${SCRIPT_DIR}/docker-logs.sh" else - echo "Run \"docker-compose -f ${SCRIPT_DIR}/../compose/docker-compose.yml logs -f\" for container logs" + echo "Run \"docker compose -f ${SCRIPT_DIR}/../compose/docker-compose.yml logs -f\" for container logs" fi diff --git a/deployment/docker/unix/docker-logs.sh b/deployment/docker/unix/docker-logs.sh index 11f114a08e1..8b17fec3448 100755 --- a/deployment/docker/unix/docker-logs.sh +++ b/deployment/docker/unix/docker-logs.sh @@ -32,7 +32,7 @@ docker_logs() { COMPOSE_FILES+=(-f "${SCRIPT_DIR}/../compose/sso/docker-compose.keycloak.yml") fi - docker-compose -f "${SCRIPT_DIR}"/../compose/docker-compose.yml "${COMPOSE_FILES[@]}" logs -f + docker compose -f "${SCRIPT_DIR}"/../compose/docker-compose.yml "${COMPOSE_FILES[@]}" logs -f } docker_common diff --git a/deployment/docker/unix/docker-undeploy.sh b/deployment/docker/unix/docker-undeploy.sh index b6d33ad574f..9a8c2b47110 100755 --- a/deployment/docker/unix/docker-undeploy.sh +++ b/deployment/docker/unix/docker-undeploy.sh @@ -32,7 +32,7 @@ docker_undeploy() { COMPOSE_FILES+=(-f "${SCRIPT_DIR}/../compose/sso/docker-compose.keycloak.yml") fi - docker-compose -f "${SCRIPT_DIR}/../compose/docker-compose.yml" "${COMPOSE_FILES[@]}" down + docker compose -f "${SCRIPT_DIR}/../compose/docker-compose.yml" "${COMPOSE_FILES[@]}" down } docker_common diff --git a/deployment/docker/win/docker-deploy.ps1 b/deployment/docker/win/docker-deploy.ps1 index c179355eb1b..2f391c2d46d 100644 --- a/deployment/docker/win/docker-deploy.ps1 +++ b/deployment/docker/win/docker-deploy.ps1 @@ -75,17 +75,17 @@ If($dev) { $compose_files+=$(Join-Path $script_dir .. compose extras docker-compose.es-dev.yml) } -docker-compose -f $(Join-Path $script_dir .. compose docker-compose.yml) $compose_files up -d +docker compose -f $(Join-Path $script_dir .. compose docker-compose.yml) $compose_files up -d Write-Host "Deploying Eclipse Kapua... DONE!" If ($logs) { Write-Host "Opening Eclipse Kapua logs..." - docker-compose -f $( Join-Path $script_dir .. compose docker-compose.yml ) logs -f + docker compose -f $( Join-Path $script_dir .. compose docker-compose.yml ) logs -f Write-Host "Opening Eclipse Kapua logs... DONE!" } Else { - Write-Host "Run `"docker-compose -f $( Join-Path $script_dir .. compose docker-compose.yml ) logs -f`" for container logs" + Write-Host "Run `"docker compose -f $( Join-Path $script_dir .. compose docker-compose.yml ) logs -f`" for container logs" } diff --git a/deployment/docker/win/docker-logs.ps1 b/deployment/docker/win/docker-logs.ps1 index 22fbbaa4712..db7ce6400fc 100644 --- a/deployment/docker/win/docker-logs.ps1 +++ b/deployment/docker/win/docker-logs.ps1 @@ -19,6 +19,6 @@ $common_path = Join-Path $script_dir docker-common.ps1 Write-Host "Opening Eclipse Kapua logs..." -docker-compose -f (Join-Path $script_dir .. compose docker-compose.yml) logs -f +docker compose -f (Join-Path $script_dir .. compose docker-compose.yml) logs -f Write-Host "Opening Eclipse Kapua logs... DONE!" diff --git a/deployment/docker/win/docker-undeploy.ps1 b/deployment/docker/win/docker-undeploy.ps1 index 9c99cd33d51..3eab85aeb69 100644 --- a/deployment/docker/win/docker-undeploy.ps1 +++ b/deployment/docker/win/docker-undeploy.ps1 @@ -19,6 +19,6 @@ $common_path = Join-Path $script_dir docker-common.ps1 Write-Host "Undeploying Eclipse Kapua..." -docker-compose -f (Join-Path $script_dir .. compose docker-compose.yml) down +docker compose -f (Join-Path $script_dir .. compose docker-compose.yml) down Write-Host "Undeploying Eclipse Kapua... DONE!"