From ab013857ef861e5c762975898d1debe2cb77b844 Mon Sep 17 00:00:00 2001 From: Saeed Rezaee Date: Mon, 5 Aug 2024 12:18:01 +0200 Subject: [PATCH] Fix: Update docker compose command This commit updates the docker compose command from `docker-compose` to `docker compose`. The command `docker-compose` is deprecated in v2 and `docker compose` is the new command to manage docker containers. https://docs.docker.com/compose/migrate/ Signed-off-by: Saeed Rezaee --- .github/workflows/pipeline-build.yml | 4 ++-- README.md | 2 +- build.gradle | 6 +++--- docker/README.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pipeline-build.yml b/.github/workflows/pipeline-build.yml index c017e9d..b07c54c 100644 --- a/.github/workflows/pipeline-build.yml +++ b/.github/workflows/pipeline-build.yml @@ -57,9 +57,9 @@ jobs: if [[ "$RUNNER_OS" == "Windows" || ( "$RUNNER_OS" == "macOS" && ${{ github.event_name }} != 'pull_request' ) ]]; then ./gradlew build -x test elif [[ ${{ github.event_name }} == 'pull_request' && ${{ github.event.pull_request.head.repo.full_name != 'eclipse-hara/hara-ddiclient' }} ]]; then - ./gradlew --info build + ./gradlew --info --stacktrace build else - ./gradlew --info build sonar + ./gradlew --info --stacktrace build sonar fi shell: bash diff --git a/README.md b/README.md index ab73559..9f5bc31 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ To build this project from source: ./gradlew assemble ``` -to build this project and run the tests (`docker 19.03.0+` and `docker-compose 1.27.0+` required): +to build this project and run the tests (`docker compose v2` required): ```shell ./gradlew build diff --git a/build.gradle b/build.gradle index 844547d..b768dec 100644 --- a/build.gradle +++ b/build.gradle @@ -242,7 +242,7 @@ task stopHawkbitServer() { if (!keep_test_container_alive) { exec { workingDir 'docker/test/' - commandLine 'docker-compose', 'down' + commandLine 'docker', 'compose', 'down' } } } @@ -253,14 +253,14 @@ task restartHawkbitServer() { doFirst { exec { workingDir 'docker/test/' - commandLine 'docker-compose', 'down' + commandLine 'docker', 'compose', 'down' } } doLast{ exec { workingDir 'docker/test/' - commandLine 'docker-compose', 'up', '--detach' + commandLine 'docker', 'compose', 'up', '--detach' } } } diff --git a/docker/README.md b/docker/README.md index 259e306..0f67d22 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,7 +1,7 @@ # LAUNCH UPDATE-SERVER ```$shell -$docker-compose up +$docker compose up ``` # DATA