Skip to content

Commit a7b3d2c

Browse files
RazvanLiviuVarzaruRazvanLiviuVarzaru
committed
Remove global minio env
1 parent 212c1fd commit a7b3d2c

2 files changed

Lines changed: 1 addition & 17 deletions

File tree

‎docker-compose/docker-compose.yaml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ services:
111111
- MASTER_CREDENTIALS_DIR
112112
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
113113
- MASTER_PACKAGES_DIR
114-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
115114
- MQ_ROUTER_URL
116115
- PORT=9995
117116
- TITLE
@@ -148,7 +147,6 @@ services:
148147
- MASTER_CREDENTIALS_DIR
149148
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
150149
- MASTER_PACKAGES_DIR
151-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
152150
- MQ_ROUTER_URL
153151
- PORT=9996
154152
- TITLE
@@ -184,7 +182,6 @@ services:
184182
- MASTER_CREDENTIALS_DIR
185183
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
186184
- MASTER_PACKAGES_DIR
187-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
188185
- MQ_ROUTER_URL
189186
- PORT=9997
190187
- TITLE
@@ -220,7 +217,6 @@ services:
220217
- MASTER_CREDENTIALS_DIR
221218
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
222219
- MASTER_PACKAGES_DIR
223-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
224220
- MQ_ROUTER_URL
225221
- PORT=9998
226222
- TITLE
@@ -256,7 +252,6 @@ services:
256252
- MASTER_CREDENTIALS_DIR
257253
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
258254
- MASTER_PACKAGES_DIR
259-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
260255
- MQ_ROUTER_URL
261256
- PORT=9999
262257
- TITLE
@@ -292,7 +287,6 @@ services:
292287
- MASTER_CREDENTIALS_DIR
293288
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
294289
- MASTER_PACKAGES_DIR
295-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
296290
- MQ_ROUTER_URL
297291
- PORT=10000
298292
- TITLE
@@ -328,7 +322,6 @@ services:
328322
- MASTER_CREDENTIALS_DIR
329323
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
330324
- MASTER_PACKAGES_DIR
331-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
332325
- MQ_ROUTER_URL
333326
- PORT=10001
334327
- TITLE
@@ -364,7 +357,6 @@ services:
364357
- MASTER_CREDENTIALS_DIR
365358
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
366359
- MASTER_PACKAGES_DIR
367-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
368360
- MQ_ROUTER_URL
369361
- PORT=10002
370362
- TITLE
@@ -400,7 +392,6 @@ services:
400392
- MASTER_CREDENTIALS_DIR
401393
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
402394
- MASTER_PACKAGES_DIR
403-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
404395
- MQ_ROUTER_URL
405396
- PORT=10003
406397
- TITLE
@@ -437,7 +428,6 @@ services:
437428
- MASTER_CREDENTIALS_DIR
438429
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
439430
- MASTER_PACKAGES_DIR
440-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
441431
- MQ_ROUTER_URL
442432
- PORT=10004
443433
- TITLE
@@ -473,7 +463,6 @@ services:
473463
- MASTER_CREDENTIALS_DIR
474464
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
475465
- MASTER_PACKAGES_DIR
476-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
477466
- MQ_ROUTER_URL
478467
- PORT=10005
479468
- TITLE
@@ -509,7 +498,6 @@ services:
509498
- MASTER_CREDENTIALS_DIR
510499
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
511500
- MASTER_PACKAGES_DIR
512-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
513501
- MQ_ROUTER_URL
514502
- PORT=10006
515503
- TITLE
@@ -546,7 +534,6 @@ services:
546534
- MASTER_CREDENTIALS_DIR
547535
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
548536
- MASTER_PACKAGES_DIR
549-
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
550537
- MQ_ROUTER_URL
551538
- PORT=10007
552539
- TITLE

‎docker-compose/generate-config.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def construct_env_section(env_vars):
144144
for key, value in sorted(env_vars.items()):
145145
if key.startswith("NGINX_"):
146146
continue
147-
elif key not in ["PORT", "MC_HOST_minio"]:
147+
elif key not in ["PORT"]:
148148
env_section += f" - {key}\n"
149149
else:
150150
env_section += f" - {key}={value}\n"
@@ -190,14 +190,12 @@ def main(args):
190190
f"container_name: master-web\n{construct_env_section(env_vars)}",
191191
)
192192

193-
env_vars["MC_HOST_minio"] = "{mc_host}"
194193
# Modify the docker_compose_template to include the environment variables
195194
docker_compose_template = DOCKER_COMPOSE_TEMPLATE.replace(
196195
"container_name: {master_name}",
197196
f"container_name: {{master_name}}\n{construct_env_section(env_vars)}",
198197
)
199198

200-
mc_host = config["private"]["minio_url"]
201199
starting_port = config["private"]["master-variables"]["starting_port"]
202200
master_web_port = 8010
203201
# Generate startup scripts and Docker Compose pieces for each master directory
@@ -227,7 +225,6 @@ def main(args):
227225
master_hostname=master_hostname,
228226
master_directory=master_directory,
229227
port=port,
230-
mc_host=mc_host,
231228
volumes=generate_volumes(master_volumes[master_name]),
232229
environment="" if args.env == "prod" else "dev_",
233230
buildbot_stop_grace_period=BUILDBOT_STOP_GRACE_PERIOD,

0 commit comments

Comments
 (0)