From 8272fcd61aae9d87c11a1d991f024d66eec6da9c Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 18 Jul 2024 22:33:56 +0800
Subject: [PATCH] Add vars
---
.docker/docker-compose.yml | 4 +++-
docker-compose.yml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 3f5a47c9e3..2b11669278 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -338,7 +338,7 @@ services:
timeout: 5s
retries: 12
- dbrepo-search-db-init:
+ dbrepo-search-service-init:
restart: "no"
container_name: dbrepo-search-service-init
hostname: search-service-init
@@ -431,8 +431,10 @@ services:
BROKER_EXCHANGE_NAME: ${BROKER_EXCHANGE_NAME:-dbrepo}
BROKER_QUEUE_NAME: ${BROKER_QUEUE_NAME:-dbrepo}
BROKER_HOST: "${BROKER_ENDPOINT:-broker-service}"
+ BROKER_PASSWORD: ${SYSTEM_USERNAME:-admin}
BROKER_PORT: ${BROKER_PORT:-5672}
BROKER_SERVICE_ENDPOINT: ${BROKER_SERVICE_ENDPOINT:-http://gateway-service/admin/broker}
+ BROKER_USERNAME: ${SYSTEM_PASSWORD:-admin}
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
CONNECTION_TIMEOUT: ${CONNECTION_TIMEOUT:-60000}
EXCHANGE_NAME: ${EXCHANGE_NAME:-dbrepo}
diff --git a/docker-compose.yml b/docker-compose.yml
index 45dbd3b362..a6ec6f46c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
MARIADB_DATABASE: "${METADATA_DB:-dbrepo}"
MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user="${METADATA_USERNAME:-root}" --password="${METADATA_DB_PASSWORD:-dbrepo}" --silent
+ test: mysqladmin ping --user=root --password="${METADATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
timeout: 5s
retries: 12
--
GitLab