From afe2aaffdd5679e61f27f7b5597b21db6a8db4e0 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 29 Aug 2023 09:34:06 +0200 Subject: Consistently use the preferences and history names in the bff code base - Part 2 - some history related properties still had a portal prefix Issue-ID: PORTALNG-50 Change-Id: Ia044b42c306b8a8837d1cda92f101aebe62283a1 Signed-off-by: Fiete Ostkamp --- development/.env | 14 +++++++------- development/docker-compose.yml | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'development') diff --git a/development/.env b/development/.env index f8e9c18..dfc9a4f 100644 --- a/development/.env +++ b/development/.env @@ -30,11 +30,11 @@ PORTALPREFS_HOST:mongo-preferences PORTALPREFS_PORT:27017 # history -PORTAL_HISTORY_IMAGE_NAME=history -PORTAL_HISTORY_IMAGE_TAG=0.1.1-de369ace -PORTALHISTORY_USERNAME:root -PORTALHISTORY_PASSWORD:password -PORTALHISTORY_DATABASE:History -PORTALHISTORY_HOST:mongo-history -PORTALHISTORY_PORT:27017 +HISTORY_IMAGE_NAME=history +HISTORY_IMAGE_TAG=0.1.1-de369ace +HISTORY_USERNAME:root +HISTORY_PASSWORD:password +HISTORY_DATABASE:History +HISTORY_HOST:mongo-history +HISTORY_PORT:27017 diff --git a/development/docker-compose.yml b/development/docker-compose.yml index 9cca867..465741c 100644 --- a/development/docker-compose.yml +++ b/development/docker-compose.yml @@ -37,21 +37,21 @@ services: container_name: mongo-history image: "${MONGO_IMAGE}:${MONGO_VERSION}" environment: - MONGO_INITDB_ROOT_USERNAME: ${PORTALHISTORY_USERNAME} - MONGO_INITDB_ROOT_PASSWORD: ${PORTALHISTORY_PASSWORD} + MONGO_INITDB_ROOT_USERNAME: ${HISTORY_USERNAME} + MONGO_INITDB_ROOT_PASSWORD: ${HISTORY_PASSWORD} history: container_name: history - image: "${IMAGE_REPOSITORY}/${PORTAL_HISTORY_IMAGE_NAME}:${PORTAL_HISTORY_IMAGE_TAG}" + image: "${IMAGE_REPOSITORY}/${HISTORY_IMAGE_NAME}:${HISTORY_IMAGE_TAG}" ports: - 9002:9002 environment: - PORTALHISTORY_USERNAME: ${PORTALHISTORY_USERNAME} - PORTALHISTORY_PASSWORD: ${PORTALHISTORY_PASSWORD} - PORTALHISTORY_DATABASE: ${PORTALHISTORY_DATABASE} + HISTORY_USERNAME: ${HISTORY_USERNAME} + HISTORY_PASSWORD: ${HISTORY_PASSWORD} + HISTORY_DATABASE: ${HISTORY_DATABASE} KEYCLOAK_URL: ${KEYCLOAK_URL} KEYCLOAK_REALM: ${KEYCLOAK_REALM} - PORTALHISTORY_HOST: ${PORTALHISTORY_HOST} - PORTALHISTORY_PORT: ${PORTALHISTORY_PORT} + HISTORY_HOST: ${HISTORY_HOST} + HISTORY_PORT: ${HISTORY_PORT} depends_on: - mongo-history mongo-preferences: -- cgit 1.2.3-korg