Skip to content

Commit

Permalink
Fix: Update docker compose command
Browse files Browse the repository at this point in the history
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 <saeed.rezaee@kynetics.it>
  • Loading branch information
SaeedRe committed Aug 5, 2024
1 parent be98c33 commit ab01385
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pipeline-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ task stopHawkbitServer() {
if (!keep_test_container_alive) {
exec {
workingDir 'docker/test/'
commandLine 'docker-compose', 'down'
commandLine 'docker', 'compose', 'down'
}
}
}
Expand All @@ -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'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# LAUNCH UPDATE-SERVER

```$shell
$docker-compose up
$docker compose up
```

# DATA
Expand Down

0 comments on commit ab01385

Please sign in to comment.