Rename Teiler Backend, Teiler Dashboard and Teiler Orchestrator

2023-08-17 18:10:12 +02:00 · 2023-08-17 18:10:12 +02:00 · 88935f9f4e
parent 82214e3345
commit 88935f9f4e
6 changed files with 82 additions and 82 deletions
--- a/ccp/modules/login-compose.yml
+++ b/ccp/modules/login-compose.yml
@ -27,7 +27,7 @@ services:
      KC_HOSTNAME_URL: "https://${HOST}/login"
      KC_HOSTNAME_STRICT: "false"
      KC_PROXY_ADDRESS_FORWARDING: "true"
-      TEILER_ROOT_CONFIG_EXTERN_URL: "https://${HOST}/ccp-teiler"
+      TEILER_ORCHESTRATOR_EXTERN_URL: "https://${HOST}/ccp-teiler"
    command:
      - start-dev --import-realm --proxy edge --http-relative-path=/login
    labels:
--- a/ccp/modules/teiler-compose.yml
+++ b/ccp/modules/teiler-compose.yml
@ -0,0 +1,71 @@
+services:
+
+  teiler-orchestrator:
+    image: docker.verbis.dkfz.de/cache/samply/teiler-orchestrator:develop
+    container_name: bridgehead-teiler-orchestrator
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.teiler_orchestrator_ccp.rule=PathPrefix(`/ccp-teiler`)"
+      - "traefik.http.services.teiler_orchestrator_ccp.loadbalancer.server.port=9000"
+      - "traefik.http.routers.teiler_orchestrator_ccp.tls=true"
+      - "traefik.http.middlewares.teiler_orchestrator_ccp_strip.stripprefix.prefixes=/ccp-teiler"
+      - "traefik.http.routers.teiler_orchestrator_ccp.middlewares=teiler_orchestrator_ccp_strip"
+    environment:
+      TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend"
+      TEILER_DASHBOARD_URL: "https://${HOST}/ccp-teiler-dashboard"
+      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE_LOWER_CASE}"
+      HTTP_RELATIVE_PATH: "/ccp-teiler"
+
+  teiler-dashboard:
+    image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:develop
+    container_name: bridgehead-teiler-dashboard
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.teiler_dashboard_ccp.rule=PathPrefix(`/ccp-teiler-dashboard`)"
+      - "traefik.http.services.teiler_dashboard_ccp.loadbalancer.server.port=80"
+      - "traefik.http.routers.teiler_dashboard_ccp.tls=true"
+      - "traefik.http.middlewares.teiler_dashboard_ccp_strip.stripprefix.prefixes=/ccp-teiler-dashboard"
+      - "traefik.http.routers.teiler_dashboard_ccp.middlewares=teiler_dashboard_ccp_strip"
+    environment:
+      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}"
+      TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend"
+      KEYCLOAK_URL: "https://${HOST}/login"
+      KEYCLOAK_REALM: "teiler"
+      KEYCLOAK_CLIENT_ID: "teiler"
+      TEILER_ADMIN_NAME: "${OPERATOR_FIRST_NAME} ${OPERATOR_LAST_NAME}"
+      TEILER_ADMIN_EMAIL: "${OPERATOR_EMAIL}"
+      TEILER_ADMIN_PHONE: "${OPERATOR_PHONE}"
+      TEILER_PROJECT: "${PROJECT}"
+      EXPORTER_API_KEY: "${EXPORTER_API_KEY}"
+      TEILER_ORCHESTRATOR_URL: "https://${HOST}/ccp-teiler"
+      TEILER_DASHBOARD_HTTP_RELATIVE_PATH: "/ccp-teiler-dashboard"
+      TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/ccp-teiler"
+
+  teiler-backend:
+    image: docker.verbis.dkfz.de/ccp/dktk-teiler-backend:latest
+    container_name: bridgehead-teiler-backend
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.teiler_backend_ccp.rule=PathPrefix(`/ccp-teiler-backend`)"
+      - "traefik.http.services.teiler_backend_ccp.loadbalancer.server.port=8085"
+      - "traefik.http.routers.teiler_backend_ccp.tls=true"
+      - "traefik.http.middlewares.teiler_backend_ccp_strip.stripprefix.prefixes=/ccp-teiler-backend"
+      - "traefik.http.routers.teiler_backend_ccp.middlewares=teiler_backend_ccp_strip"
+    environment:
+      LOG_LEVEL: "INFO"
+      APPLICATION_PORT: "8085"
+      APPLICATION_ADDRESS: "${HOST}"
+      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}"
+      CONFIG_ENV_VAR_PATH: "/run/secrets/ccp.conf"
+      TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/ccp-teiler"
+      TEILER_ORCHESTRATOR_URL: "https://${HOST}/ccp-teiler"
+      TEILER_DASHBOARD_DE_URL: "https://${HOST}/ccp-teiler-dashboard/de"
+      TEILER_DASHBOARD_EN_URL: "https://${HOST}/ccp-teiler-dashboard/en"
+      CENTRAX_URL: "${CENTRAXX_URL}"
+      HTTP_PROXY: "http://forward_proxy:3128"
+    secrets:
+      - ccp.conf
+
+secrets:
+  ccp.conf:
+    file: /etc/bridgehead/ccp.conf
--- a/ccp/modules/teiler-setup.sh
+++ b/ccp/modules/teiler-setup.sh
@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ "$ENABLE_TEILER" == true ];then
+  log INFO "Teiler setup detected -- will start Teiler services."
+  OVERRIDE+=" -f ./$PROJECT/modules/teiler-compose.yml"
+fi
--- a/ccp/modules/teiler-ui-compose.yml
+++ b/ccp/modules/teiler-ui-compose.yml
@ -1,71 +0,0 @@
-services:
-
-  teiler-root-config:
-    image: docker.verbis.dkfz.de/cache/samply/teiler-root-config:develop
-    container_name: bridgehead-teiler-root-config
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.teiler_root_config_ccp.rule=PathPrefix(`/ccp-teiler`)"
-      - "traefik.http.services.teiler_root_config_ccp.loadbalancer.server.port=9000"
-      - "traefik.http.routers.teiler_root_config_ccp.tls=true"
-      - "traefik.http.middlewares.teiler_root_config_ccp_strip.stripprefix.prefixes=/ccp-teiler"
-      - "traefik.http.routers.teiler_root_config_ccp.middlewares=teiler_root_config_ccp_strip"
-    environment:
-      TEILER_CORE_URL: "https://${HOST}/ccp-teiler-core"
-      TEILER_UI_URL: "https://${HOST}/ccp-teiler-ui"
-      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE_LOWER_CASE}"
-      HTTP_RELATIVE_PATH: "/ccp-teiler"
-
-  teiler-ui:
-    image: docker.verbis.dkfz.de/cache/samply/teiler-ui:develop
-    container_name: bridgehead-teiler-ui
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.teiler_ui_ccp.rule=PathPrefix(`/ccp-teiler-ui`)"
-      - "traefik.http.services.teiler_ui_ccp.loadbalancer.server.port=80"
-      - "traefik.http.routers.teiler_ui_ccp.tls=true"
-      - "traefik.http.middlewares.teiler_ui_ccp_strip.stripprefix.prefixes=/ccp-teiler-ui"
-      - "traefik.http.routers.teiler_ui_ccp.middlewares=teiler_ui_ccp_strip"
-    environment:
-      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}"
-      TEILER_CORE_URL: "https://${HOST}/ccp-teiler-core"
-      KEYCLOAK_URL: "https://${HOST}/login"
-      KEYCLOAK_REALM: "teiler-ui"
-      KEYCLOAK_CLIENT_ID: "teiler-ui"
-      TEILER_ADMIN_NAME: "${OPERATOR_FIRST_NAME} ${OPERATOR_LAST_NAME}"
-      TEILER_ADMIN_EMAIL: "${OPERATOR_EMAIL}"
-      TEILER_ADMIN_PHONE: "${OPERATOR_PHONE}"
-      TEILER_PROJECT: "${PROJECT}"
-      EXPORTER_API_KEY: "${EXPORTER_API_KEY}"
-      TEILER_ROOT_CONFIG_URL: "https://${HOST}/ccp-teiler"
-      TEILER_UI_HTTP_RELATIVE_PATH: "/ccp-teiler-ui"
-      TEILER_ROOT_CONFIG_HTTP_RELATIVE_PATH: "/ccp-teiler"
-
-  teiler-core:
-    image: docker.verbis.dkfz.de/ccp/dktk-teiler-core:latest
-    container_name: bridgehead-teiler-core
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.teiler_core_ccp.rule=PathPrefix(`/ccp-teiler-core`)"
-      - "traefik.http.services.teiler_core_ccp.loadbalancer.server.port=8085"
-      - "traefik.http.routers.teiler_core_ccp.tls=true"
-      - "traefik.http.middlewares.teiler_core_ccp_strip.stripprefix.prefixes=/ccp-teiler-core"
-      - "traefik.http.routers.teiler_core_ccp.middlewares=teiler_core_ccp_strip"
-    environment:
-      LOG_LEVEL: "INFO"
-      APPLICATION_PORT: "8085"
-      APPLICATION_ADDRESS: "${HOST}"
-      DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}"
-      CONFIG_ENV_VAR_PATH: "/run/secrets/ccp.conf"
-      TEILER_ROOT_CONFIG_HTTP_RELATIVE_PATH: "/ccp-teiler"
-      TEILER_ROOT_CONFIG_URL: "https://${HOST}/ccp-teiler"
-      TEILER_UI_DE_URL: "https://${HOST}/ccp-teiler-ui/de"
-      TEILER_UI_EN_URL: "https://${HOST}/ccp-teiler-ui/en"
-      CENTRAX_URL: "${CENTRAXX_URL}"
-      HTTP_PROXY: "http://forward_proxy:3128"
-    secrets:
-      - ccp.conf
-
-secrets:
-  ccp.conf:
-    file: /etc/bridgehead/ccp.conf
--- a/ccp/modules/teiler-ui-setup.sh
+++ b/ccp/modules/teiler-ui-setup.sh
@ -1,6 +0,0 @@
-#!/bin/bash
-
-if [ "$ENABLE_TEILER" == true ];then
-  log INFO "Teiler-UI setup detected -- will start Teiler-UI services."
-  OVERRIDE+=" -f ./$PROJECT/modules/teiler-ui-compose.yml"
-fi
--- a/ccp/modules/teiler-ui.md
+++ b/ccp/modules/teiler-ui.md
@ -1,17 +1,17 @@
 # Teiler
 This module orchestrates the different microfrontends of the bridgehead as a single page application.  

-## Teiler Root Config
+## Teiler Orchestrator
 Single SPA component that consists on the root HTML site of the single page application and a javascript code that
-gets the information about the microfrontend calling the teiler core and is responsible for registering them. With the
+gets the information about the microfrontend calling the teiler backend and is responsible for registering them. With the
 resulting mapping, it can initialize, mount and unmount the required microfrontends on the fly. 

 The microfrontends run independently in different containers and can be based on different frameworks (Angular, Vue, React,...)
 This microfrontends can run as single alone but need an extension with Single-SPA (https://single-spa.js.org/docs/ecosystem).
 There are also available three templates (Angular, Vue, React) to be directly extended to be used directly in the teiler.

-## Teiler UI
+## Teiler Dashboard
 It consists on the main dashboard and a set of embedded services. 

-## Teiler Core
+## Teiler Backend
 In this component, the microfrontends are configured.