Skip to content

Commit

Permalink
Find docker location
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Perkins <cwperx@amazon.com>
  • Loading branch information
cwperks committed Oct 24, 2024
1 parent daaad12 commit be53f12
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,15 @@ 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")
}

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',
Expand Down

0 comments on commit be53f12

Please sign in to comment.