From 692e7d03ec43f00fdaa10b6d5a8347d6182b6571 Mon Sep 17 00:00:00 2001 From: Nathan Baulch Date: Wed, 4 Sep 2024 08:20:50 +1000 Subject: [PATCH] Switch to docker compose --- .github/workflows/test.yml | 2 +- README.md | 4 ++-- docs/guides/rollover.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 65069f42..707ce8ae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -98,7 +98,7 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-go- - name: Run Docker containers - run: docker-compose up --detach + run: docker compose up --detach env: OSS_IMAGE: "${{ matrix.oss-image }}:${{ matrix.version }}" ES_COMMAND: "${{matrix.ES_COMMAND}}" diff --git a/README.md b/README.md index 762f94db..eecfc66d 100644 --- a/README.md +++ b/README.md @@ -299,8 +299,8 @@ export ES_KIBANA_IMAGE="" export OPENSEARCH_PREFIX="plugins.security" export OSS_ENV_VAR="plugins.security.disabled=true" export XPACK_IMAGE="docker.elastic.co/elasticsearch/elasticsearch:7.10.1" -docker-compose up -d -docker-compose ps -a +docker compose up -d +docker compose ps -a ``` When running tests, ensure that your test/debug profile has environmental variables as below: diff --git a/docs/guides/rollover.md b/docs/guides/rollover.md index 4b69ee03..14d1c141 100644 --- a/docs/guides/rollover.md +++ b/docs/guides/rollover.md @@ -75,7 +75,7 @@ resource "elasticsearch_index" "test" { ```sh $ export ES_OSS_IMAGE=elasticsearch:7.9.2 -$ docker-compose up -d elasticsearch +$ docker compose up -d elasticsearch Creating network "terraform-provider-elasticsearch_default" with the default driver Creating terraform-provider-elasticsearch_elasticsearch_1 ... done ```