Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expose minIO configuration as environment variable #611

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Expose minIO configuration as environment variable #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docker-compose/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 1 addition & 2 deletions docker-compose/.env.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
42 changes: 14 additions & 28 deletions docker-compose/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions docker-compose/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down