Revert "Remove global minio env"

This reverts commit a7b3d2c.

Author: RazvanLiviuVarzaru

docker-compose/docker-compose.yaml

@@ -111,6 +111,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=9995
       - TITLE
@@ -147,6 +148,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=9996
       - TITLE
@@ -182,6 +184,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=9997
       - TITLE
@@ -217,6 +220,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=9998
       - TITLE
@@ -252,6 +256,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=9999
       - TITLE
@@ -287,6 +292,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=10000
       - TITLE
@@ -322,6 +328,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=10001
       - TITLE
@@ -357,6 +364,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=10002
       - TITLE
@@ -392,6 +400,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=10003
       - TITLE
@@ -428,6 +437,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=10004
       - TITLE
@@ -463,6 +473,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=10005
       - TITLE
@@ -498,6 +509,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=10006
       - TITLE
@@ -534,6 +546,7 @@ services:
       - MASTER_CREDENTIALS_DIR
       - MASTER_NONLATENT_DOCKERLIBRARY_WORKER
       - MASTER_PACKAGES_DIR
+      - MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
       - MQ_ROUTER_URL
       - PORT=10007
       - TITLE

docker-compose/generate-config.py

@@ -144,7 +144,7 @@ def construct_env_section(env_vars):
     for key, value in sorted(env_vars.items()):
         if key.startswith("NGINX_"):
             continue
-        elif key not in ["PORT"]:
+        elif key not in ["PORT", "MC_HOST_minio"]:
             env_section += f"      - {key}\n"
         else:
             env_section += f"      - {key}={value}\n"
@@ -190,12 +190,14 @@ def main(args):
         f"container_name: master-web\n{construct_env_section(env_vars)}",
     )
 
+    env_vars["MC_HOST_minio"] = "{mc_host}"
     # Modify the docker_compose_template to include the environment variables
     docker_compose_template = DOCKER_COMPOSE_TEMPLATE.replace(
         "container_name: {master_name}",
         f"container_name: {{master_name}}\n{construct_env_section(env_vars)}",
     )
 
+    mc_host = config["private"]["minio_url"]
     starting_port = config["private"]["master-variables"]["starting_port"]
     master_web_port = 8010
     # Generate startup scripts and Docker Compose pieces for each master directory
@@ -225,6 +227,7 @@ def main(args):
                 master_hostname=master_hostname,
                 master_directory=master_directory,
                 port=port,
+                mc_host=mc_host,
                 volumes=generate_volumes(master_volumes[master_name]),
                 environment="" if args.env == "prod" else "dev_",
                 buildbot_stop_grace_period=BUILDBOT_STOP_GRACE_PERIOD,