From be53f126413c9e22012ef4a5bca69b75483aa205 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 23 Oct 2024 20:01:28 -0400 Subject: [PATCH] Find docker location Signed-off-by: Craig Perkins --- .github/workflows/gradle.yml | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 711555ba..209f5502 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -63,7 +63,7 @@ jobs: working-directory: ./tmp/performance-analyzer run: ./gradlew updateShas - name: Set docker-compose path - run: echo "DOCKER_COMPOSE_LOCATION=$(which docker-compose)" >> $GITHUB_ENV + run: echo "DOCKER_COMPOSE_LOCATION=$(which docker)" >> $GITHUB_ENV # Set the vm.max_map_count system property to the minimum required to run OpenSearch - name: Set vm.max_map_count run: sudo sysctl -w vm.max_map_count=262144 diff --git a/build.gradle b/build.gradle index 7c39b41c..775a9c2f 100644 --- a/build.gradle +++ b/build.gradle @@ -498,7 +498,7 @@ task runDocker(type: Exec) { // It sets the path to the docker-compose program from an environment variable // The DOCKER_COMPOSE_LOCATION environment variable is set in the gradle.yml file inside the // performance-analyzer repository. - def docker_compose_location = "docker compose" + def docker_compose_location = "docker" if (System.getenv("DOCKER_COMPOSE_LOCATION") != null) { docker_compose_location = System.getenv("DOCKER_COMPOSE_LOCATION") } @@ -506,7 +506,7 @@ task runDocker(type: Exec) { environment 'DATA_VOLUME1', 'opensearchdata1' environment 'DATA_VOLUME2', 'opensearchdata2' - commandLine(docker_compose_location, + commandLine(docker_compose_location, 'compose', '-f', 'docker-compose.yml', '-f', 'docker-compose.hostports.yml', '-f', 'docker-compose.cluster.yml',