From 9af340760557ad84a91192f7f7d3b1d6b51e5577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= <lukas.vlcek@aiven.io>
Date: Tue, 12 Jul 2022 20:55:48 +0200
Subject: [PATCH] Upgrade MinIO image version (#3541)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On top of that addressing MinIO warning:
- setup ulimits
- use of static console port
- do not use deprecated argument names

With regard to static ports this is related to a change MinIO introduced in RELEASE.2021-07-08T01-15-01Z where the console was embedded into the server itself. For more details visit: https://docs.min.io/minio/baremetal/console/minio-console.html

We could let the port be assigned dynamically, however, when we set it statically it can give user an option to make use of the console web UI for MinIO troubleshooting (though I think the ports still need to be exported in this case).

Closes #3539

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
---
 test/fixtures/minio-fixture/Dockerfile        |  6 ++--
 .../fixtures/minio-fixture/docker-compose.yml | 36 ++++++++++++-------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/test/fixtures/minio-fixture/Dockerfile b/test/fixtures/minio-fixture/Dockerfile
index 54bb562c790c1..b56440c0d44a9 100644
--- a/test/fixtures/minio-fixture/Dockerfile
+++ b/test/fixtures/minio-fixture/Dockerfile
@@ -1,9 +1,9 @@
-FROM minio/minio:RELEASE.2019-01-23T23-18-58Z
+FROM minio/minio:RELEASE.2022-06-25T15-50-16Z
 
 ARG bucket
 ARG accessKey
 ARG secretKey
 
 RUN mkdir -p /minio/data/${bucket}
-ENV MINIO_ACCESS_KEY=${accessKey}
-ENV MINIO_SECRET_KEY=${secretKey}
+ENV MINIO_ROOT_USER=${accessKey}
+ENV MINIO_ROOT_PASSWORD=${secretKey}
diff --git a/test/fixtures/minio-fixture/docker-compose.yml b/test/fixtures/minio-fixture/docker-compose.yml
index 7b66f04152b47..4c0245772ed4c 100644
--- a/test/fixtures/minio-fixture/docker-compose.yml
+++ b/test/fixtures/minio-fixture/docker-compose.yml
@@ -8,9 +8,13 @@ services:
         accessKey: "access_key"
         secretKey: "secret_key"
       dockerfile: Dockerfile
+    ulimits:
+      nofile:
+        hard: 4096
+        soft: 4096
     ports:
       - "9000"
-    command: ["server", "/minio/data"]
+    command: ["server", "--console-address", ":9001", "/minio/data"]
   minio-fixture-other:
     build:
       context: .
@@ -19,17 +23,25 @@ services:
         accessKey: "access_key"
         secretKey: "secret_key"
       dockerfile: Dockerfile
+    ulimits:
+      nofile:
+        hard: 4096
+        soft: 4096
     ports:
       - "9000"
-    command: ["server", "/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"
+    command: ["server", "--console-address", ":9001", "/minio/data"]