Expose minIO configuration as environment variable

MariaDB · Nov 8, 2024 · 9cb2bea · 9cb2bea
1 parent 317306d
commit 9cb2bea
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 39 deletions.
diff --git a/docker-compose/.env b/docker-compose/.env
@@ -25,5 +25,4 @@ MASTER_NONLATENT_BINTARS_WORKERS = '
 MASTER_NONLATENT_BINTARS_VM_PORT="10000"
 MASTER_NONLATENT_BINTARS_WORKER_PORT="10002"
 CONTAINER_REGISTRY_URL="quay.io/mariadb-foundation/bb-worker:"
-MINIO_WG_IP="127.0.0.1" #FIXME WITH MINIO PROD INSTANCE WG IP
-MINIO_PORT="9000"
+MC_HOST_minio="http://minio:minioadmin@localhost:9000"
diff --git a/docker-compose/.env.dev b/docker-compose/.env.dev
@@ -23,5 +23,4 @@ MASTER_NONLATENT_BINTARS_WORKERS = '
 MASTER_NONLATENT_BINTARS_VM_PORT="20000"
 MASTER_NONLATENT_BINTARS_WORKER_PORT="10007"
 CONTAINER_REGISTRY_URL="quay.io/mariadb-foundation/bb-worker:dev_"
-MINIO_WG_IP="127.0.0.1" #FIXME WITH MINIO DEV INSTANCE WG IP
-MINIO_PORT="9000"
+MC_HOST_minio="http://minio:minioadmin@localhost:9000"
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
@@ -77,8 +77,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=8010
       - TITLE
@@ -114,8 +113,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=9996
       - TITLE
@@ -154,8 +152,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=9997
       - TITLE
@@ -193,8 +190,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=9998
       - TITLE
@@ -232,8 +228,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=9999
       - TITLE
@@ -271,8 +266,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=10000
       - TITLE
@@ -310,8 +304,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=10001
       - TITLE
@@ -349,8 +342,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=10002
       - TITLE
@@ -388,8 +380,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=10003
       - TITLE
@@ -427,8 +418,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=10004
       - TITLE
@@ -466,8 +456,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=10005
       - TITLE
@@ -505,8 +494,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=10006
       - TITLE
@@ -544,8 +532,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=10007
       - TITLE
@@ -583,8 +570,7 @@ services:
       - MASTER_NONLATENT_BINTARS_WORKER_PORT
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
-      - MINIO_PORT
-      - MINIO_WG_IP
+      - MC_HOST_minio
       - MQ_ROUTER_URL
       - PORT=10008
       - TITLE

diff --git a/docker-compose/start.sh b/docker-compose/start.sh
@@ -38,13 +38,6 @@ if [[ $1 == "master-libvirt" ]]; then
   }
 fi
 
-# configure mc client
-if command -v mc &> /dev/null; then
-  mc alias set minio http://"$MINIO_WG_IP":"$MINIO_PORT" minio minioadmin
-else
-  echo "mc command not found"
-fi
-
 # loop for debug
 # while true; do date && sleep 30; done