Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete compose version specifier #17382

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion distribution/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Only used for testing the docker images
version: '3'
services:
opensearch-1:
image: opensearch:test
Expand Down
1 change: 0 additions & 1 deletion qa/remote-clusters/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Only used for testing the docker images
version: '3.7'
services:
opensearch-1:
image: opensearch:test
Expand Down
1 change: 0 additions & 1 deletion qa/wildfly/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:

wildfly:
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/azure-fixture/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
azure-fixture:
build:
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/gcs-fixture/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
gcs-fixture:
build:
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/krb5kdc-fixture/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
peppa:
hostname: kerberos.build.opensearch.org
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/minio-fixture/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.2'
services:
minio-fixture:
build:
Expand Down
87 changes: 43 additions & 44 deletions test/fixtures/s3-fixture/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
s3-fixture:
build:
Expand Down Expand Up @@ -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"
Loading