diff --git a/distribution/docker/docker-compose.yml b/distribution/docker/docker-compose.yml index 5ed2b159ffe2b..5e0a69a3be91b 100644 --- a/distribution/docker/docker-compose.yml +++ b/distribution/docker/docker-compose.yml @@ -1,5 +1,4 @@ # Only used for testing the docker images -version: '3' services: opensearch-1: image: opensearch:test diff --git a/qa/remote-clusters/docker-compose.yml b/qa/remote-clusters/docker-compose.yml index 2112da17efe6e..bd425f7771597 100644 --- a/qa/remote-clusters/docker-compose.yml +++ b/qa/remote-clusters/docker-compose.yml @@ -1,5 +1,4 @@ # Only used for testing the docker images -version: '3.7' services: opensearch-1: image: opensearch:test diff --git a/qa/wildfly/docker-compose.yml b/qa/wildfly/docker-compose.yml index 2a0779d999f25..93b83a1b39804 100644 --- a/qa/wildfly/docker-compose.yml +++ b/qa/wildfly/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.7' services: wildfly: diff --git a/test/fixtures/azure-fixture/docker-compose.yml b/test/fixtures/azure-fixture/docker-compose.yml index 85e073e1803c1..c68d4739d1fd9 100644 --- a/test/fixtures/azure-fixture/docker-compose.yml +++ b/test/fixtures/azure-fixture/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: azure-fixture: build: diff --git a/test/fixtures/gcs-fixture/docker-compose.yml b/test/fixtures/gcs-fixture/docker-compose.yml index 30a362e7caa8d..394a37915966c 100644 --- a/test/fixtures/gcs-fixture/docker-compose.yml +++ b/test/fixtures/gcs-fixture/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: gcs-fixture: build: diff --git a/test/fixtures/krb5kdc-fixture/docker-compose.yml b/test/fixtures/krb5kdc-fixture/docker-compose.yml index a178ea576e87c..731940f415cb3 100644 --- a/test/fixtures/krb5kdc-fixture/docker-compose.yml +++ b/test/fixtures/krb5kdc-fixture/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: peppa: hostname: kerberos.build.opensearch.org diff --git a/test/fixtures/minio-fixture/docker-compose.yml b/test/fixtures/minio-fixture/docker-compose.yml index 539ca9471fa04..59d915b022d9c 100644 --- a/test/fixtures/minio-fixture/docker-compose.yml +++ b/test/fixtures/minio-fixture/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.2' services: minio-fixture: build: diff --git a/test/fixtures/s3-fixture/docker-compose.yml b/test/fixtures/s3-fixture/docker-compose.yml index d2b44f13c9530..44a70f76df459 100644 --- a/test/fixtures/s3-fixture/docker-compose.yml +++ b/test/fixtures/s3-fixture/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: s3-fixture: build: @@ -62,50 +61,50 @@ services: - "80" s3-fixture-with-ec2: - build: - context: . - args: - fixtureClass: fixture.s3.S3HttpFixtureWithEC2 - port: 80 - bucket: "ec2_bucket" - basePath: "ec2_base_path" - accessKey: "ec2_access_key" - sessionToken: "ec2_session_token" - dockerfile: Dockerfile - volumes: - - ./testfixtures_shared/shared:/fixture/shared - ports: - - "80" + build: + context: . + args: + fixtureClass: fixture.s3.S3HttpFixtureWithEC2 + port: 80 + bucket: "ec2_bucket" + basePath: "ec2_base_path" + accessKey: "ec2_access_key" + sessionToken: "ec2_session_token" + dockerfile: Dockerfile + volumes: + - ./testfixtures_shared/shared:/fixture/shared + ports: + - "80" s3-fixture-with-ecs: - build: - context: . - args: - fixtureClass: fixture.s3.S3HttpFixtureWithECS - port: 80 - bucket: "ecs_bucket" - basePath: "ecs_base_path" - accessKey: "ecs_access_key" - sessionToken: "ecs_session_token" - dockerfile: Dockerfile - volumes: - - ./testfixtures_shared/shared:/fixture/shared - ports: - - "80" + build: + context: . + args: + fixtureClass: fixture.s3.S3HttpFixtureWithECS + port: 80 + bucket: "ecs_bucket" + basePath: "ecs_base_path" + accessKey: "ecs_access_key" + sessionToken: "ecs_session_token" + dockerfile: Dockerfile + volumes: + - ./testfixtures_shared/shared:/fixture/shared + ports: + - "80" s3-fixture-with-eks: - build: - context: . - args: - fixtureClass: fixture.s3.S3HttpFixtureWithEKS - port: 80 - bucket: "eks_bucket" - basePath: "eks_base_path" - accessKey: "eks_access_key" - roleArn: "eks_role_arn" - roleSessionName: "eks_role_session_name" - dockerfile: Dockerfile.eks - volumes: - - ./testfixtures_shared/shared:/fixture/shared - ports: - - "80" + build: + context: . + args: + fixtureClass: fixture.s3.S3HttpFixtureWithEKS + port: 80 + bucket: "eks_bucket" + basePath: "eks_base_path" + accessKey: "eks_access_key" + roleArn: "eks_role_arn" + roleSessionName: "eks_role_session_name" + dockerfile: Dockerfile.eks + volumes: + - ./testfixtures_shared/shared:/fixture/shared + ports: + - "80"