From f3e2d7fc619516074fdc37e3e98171f68d8682db Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Tue, 22 Nov 2022 13:07:49 -0500
Subject: [PATCH] [BUG]
 org.opensearch.repositories.s3.RepositoryS3ClientYamlTestSuiteIT/test
 {yaml=repository_s3/20_repository_permanent_credentials/Snapshot and Restore
 with repository-s3 using permanent credentials} flaky (#5325) (#5339)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 test/fixtures/minio-fixture/Dockerfile        |  2 +-
 .../fixtures/minio-fixture/docker-compose.yml | 60 +++++++++++++++----
 2 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/test/fixtures/minio-fixture/Dockerfile b/test/fixtures/minio-fixture/Dockerfile
index 54bb562c790c1..7d32606525645 100644
--- a/test/fixtures/minio-fixture/Dockerfile
+++ b/test/fixtures/minio-fixture/Dockerfile
@@ -1,4 +1,4 @@
-FROM minio/minio:RELEASE.2019-01-23T23-18-58Z
+FROM minio/minio:RELEASE.2022-11-17T23-20-09Z
 
 ARG bucket
 ARG accessKey
diff --git a/test/fixtures/minio-fixture/docker-compose.yml b/test/fixtures/minio-fixture/docker-compose.yml
index 7b66f04152b47..03541c997de80 100644
--- a/test/fixtures/minio-fixture/docker-compose.yml
+++ b/test/fixtures/minio-fixture/docker-compose.yml
@@ -8,9 +8,21 @@ services:
         accessKey: "access_key"
         secretKey: "secret_key"
       dockerfile: Dockerfile
+    ulimits:
+      nofile:
+        hard: 4096
+        soft: 4096
     ports:
       - "9000"
-    command: ["server", "/minio/data"]
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+    volumes:
+      - type: tmpfs
+        target: /minio/data
+    command: ["server", "--console-address", ":9001", "/minio/data"]
   minio-fixture-other:
     build:
       context: .
@@ -21,15 +33,39 @@ services:
       dockerfile: Dockerfile
     ports:
       - "9000"
-    command: ["server", "/minio/data"]
+    ulimits:
+      nofile:
+        hard: 4096
+        soft: 4096
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+    volumes:
+      - type: tmpfs
+        target: /minio/data
+    command: ["server", "--console-address", ":9001", "/minio/data"]
   minio-fixture-for-snapshot-tool:
-      build:
-        context: .
-        args:
-          bucket: "bucket"
-          accessKey: "sn_tool_access_key"
-          secretKey: "sn_tool_secret_key"
-        dockerfile: Dockerfile
-      ports:
-        - "9000"
-      command: ["server", "/minio/data"]
+    build:
+      context: .
+      args:
+        bucket: "bucket"
+        accessKey: "sn_tool_access_key"
+        secretKey: "sn_tool_secret_key"
+      dockerfile: Dockerfile
+    ulimits:
+      nofile:
+        hard: 4096
+        soft: 4096
+    ports:
+      - "9000"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+    volumes:
+      - type: tmpfs
+        target: /minio/data
+    command: ["server", "--console-address", ":9001", "/minio/data"]