From 976454c2cd90f35229737d318d607639152dc9bf Mon Sep 17 00:00:00 2001 From: Mario Calderon - Systemhaus Westfalia Date: Fri, 19 Jul 2024 10:25:49 -0600 Subject: [PATCH 1/2] Add missing 'adempiere.report.engine' service definition to Docker Compose service file 10c-grpc_proxy_service_standard.yml --- .../10c-grpc_proxy_service_standard.yml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docker-compose/10c-grpc_proxy_service_standard.yml b/docker-compose/10c-grpc_proxy_service_standard.yml index 1650f49a..b76e751f 100644 --- a/docker-compose/10c-grpc_proxy_service_standard.yml +++ b/docker-compose/10c-grpc_proxy_service_standard.yml @@ -1,5 +1,36 @@ # For modes: STANDARD, AUTH + adempiere.report.engine: + image: ${VUE_REPORT_GRPC_SERVER_IMAGE} + container_name: ${VUE_REPORT_GRPC_SERVER_CONTAINER_NAME} + hostname: ${VUE_REPORT_GRPC_SERVER_HOSTNAME} + restart: ${GENERIC_RESTART} + volumes: + - ${TIMEZONE_PATH_ON_HOST}:${TIMEZONE_PATH_ON_CONTAINER}:${TIMEZONE_OPTIONS} # Map the Timezone of the host to the Timezone of the container + - ${LOCALTIME_PATH_ON_HOST}:${LOCALTIME_PATH_ON_CONTAINER}:${LOCALTIME_OPTIONS} # Map the Localtime of the host to the Timezone of the container + healthcheck: + test: "bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/${VUE_REPORT_GRPC_SERVER_PORT}; exit $?;'" + interval: 10s + retries: 60 + start_period: 20s + timeout: 10s + depends_on: + postgresql.service: + condition: service_healthy + environment: + SERVER_PORT: ${VUE_REPORT_GRPC_SERVER_PORT} + DB_HOST: ${VUE_REPORT_GRPC_SERVER_DB_HOST} + DB_PORT: ${VUE_REPORT_GRPC_SERVER_DB_PORT} + DB_NAME: ${VUE_REPORT_GRPC_SERVER_DB_NAME} + DB_USER: ${VUE_REPORT_GRPC_SERVER_DB_USER} + DB_PASSWORD: ${VUE_REPORT_GRPC_SERVER_DB_PASSWORD} + SERVER_LOG_LEVEL: ${VUE_REPORT_GRPC_SERVER_LOG_LEVEL} + # ports: + # - ${VUE_REPORT_GRPC_SERVER_PORT} + networks: + - adempiere_network + + grpc.proxy: image: ${ENVOY_GRPC_PROXY_IMAGE} container_name: ${ENVOY_GRPC_PROXY_CONTAINER_NAME} @@ -7,6 +38,7 @@ depends_on: - adempiere.grpc.server - adempiere.processor + - adempiere.report.engine healthcheck: test: "bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/${ENVOY_GRPC_PROXY_BACKEND_PORT}; exit $?;'" interval: 10s @@ -22,6 +54,7 @@ - ./envoy/envoy.yaml:/etc/envoy/envoy.yaml:ro - ./envoy/definitions/adempiere-grpc-server.pb:/data/adempiere-grpc-server.pb:ro - ./envoy/definitions/adempiere-processors-service-service.pb:/data/adempiere-processors-service-service.pb:ro + - ./envoy/definitions/adempiere-report-engine-service.dsc:/data/adempiere-report-engine-service.dsc:ro - ${TIMEZONE_PATH_ON_HOST}:${TIMEZONE_PATH_ON_CONTAINER}:${TIMEZONE_OPTIONS} # Map the Timezone of the host to the Timezone of the container - ${LOCALTIME_PATH_ON_HOST}:${LOCALTIME_PATH_ON_CONTAINER}:${LOCALTIME_OPTIONS} # Map the Localtime of the host to the Timezone of the container networks: From 024e6e3dd2148461f49079839c1f2417a4c7b528 Mon Sep 17 00:00:00 2001 From: Mario Calderon - Systemhaus Westfalia Date: Mon, 19 Aug 2024 08:28:32 -0600 Subject: [PATCH 2/2] add report engine service as a separate service for non-legacy files --- docker-compose/10a-report_engine_service.yml | 31 +++++ ...yml => 11b-grpc_proxy_service_develop.yml} | 0 ...ml => 11c-grpc_proxy_service_standard.yml} | 31 ----- ...vue.yml => 11d-grpc_proxy_service_vue.yml} | 0 ..._ui_service.yml => 12a-vue_ui_service.yml} | 0 ..._service.yml => 13a-zookeeper_service.yml} | 0 ...afka_service.yml => 14a-kafka_service.yml} | 0 ...yml => 14b-kafka_service_with_kafdrop.yml} | 0 ...15a-opensearch_node_service_with_port.yml} | 0 ...-opensearch_node_service_without_port.yml} | 0 ...e.yml => 16a-opensearch_setup_service.yml} | 0 ...=> 17a-dictionary_rs_service_standard.yml} | 0 ... => 17c-dictionary_rs_service_develop.yml} | 0 ...th.yml => 18a-ui_gateway_service_auth.yml} | 0 ...e.yml => 18b-ui_gateway_service_cache.yml} | 0 ...yml => 18c-ui_gateway_service_develop.yml} | 0 ...ml => 18d-ui_gateway_service_standard.yml} | 0 ...yml => 18e-ui_gateway_service_storage.yml} | 0 ...vue.yml => 18f-ui_gateway_service_vue.yml} | 0 ...k_service.yml => 19a-keycloak_service.yml} | 0 ...ensearch_dashboards_service_with_port.yml} | 0 docker-compose/start-all.sh | 116 ++++++++++-------- 22 files changed, 95 insertions(+), 83 deletions(-) create mode 100644 docker-compose/10a-report_engine_service.yml rename docker-compose/{10b-grpc_proxy_service_develop.yml => 11b-grpc_proxy_service_develop.yml} (100%) rename docker-compose/{10c-grpc_proxy_service_standard.yml => 11c-grpc_proxy_service_standard.yml} (52%) rename docker-compose/{10d-grpc_proxy_service_vue.yml => 11d-grpc_proxy_service_vue.yml} (100%) rename docker-compose/{11a-vue_ui_service.yml => 12a-vue_ui_service.yml} (100%) rename docker-compose/{12a-zookeeper_service.yml => 13a-zookeeper_service.yml} (100%) rename docker-compose/{13a-kafka_service.yml => 14a-kafka_service.yml} (100%) rename docker-compose/{13b-kafka_service_with_kafdrop.yml => 14b-kafka_service_with_kafdrop.yml} (100%) rename docker-compose/{14a-opensearch_node_service_with_port.yml => 15a-opensearch_node_service_with_port.yml} (100%) rename docker-compose/{14b-opensearch_node_service_without_port.yml => 15b-opensearch_node_service_without_port.yml} (100%) rename docker-compose/{15a-opensearch_setup_service.yml => 16a-opensearch_setup_service.yml} (100%) rename docker-compose/{16a-dictionary_rs_service_standard.yml => 17a-dictionary_rs_service_standard.yml} (100%) rename docker-compose/{16c-dictionary_rs_service_develop.yml => 17c-dictionary_rs_service_develop.yml} (100%) rename docker-compose/{17a-ui_gateway_service_auth.yml => 18a-ui_gateway_service_auth.yml} (100%) rename docker-compose/{17b-ui_gateway_service_cache.yml => 18b-ui_gateway_service_cache.yml} (100%) rename docker-compose/{17c-ui_gateway_service_develop.yml => 18c-ui_gateway_service_develop.yml} (100%) rename docker-compose/{17d-ui_gateway_service_standard.yml => 18d-ui_gateway_service_standard.yml} (100%) rename docker-compose/{17e-ui_gateway_service_storage.yml => 18e-ui_gateway_service_storage.yml} (100%) rename docker-compose/{17f-ui_gateway_service_vue.yml => 18f-ui_gateway_service_vue.yml} (100%) rename docker-compose/{18a-keycloak_service.yml => 19a-keycloak_service.yml} (100%) rename docker-compose/{19a-opensearch_dashboards_service_with_port.yml => 20a-opensearch_dashboards_service_with_port.yml} (100%) diff --git a/docker-compose/10a-report_engine_service.yml b/docker-compose/10a-report_engine_service.yml new file mode 100644 index 00000000..e761e1cd --- /dev/null +++ b/docker-compose/10a-report_engine_service.yml @@ -0,0 +1,31 @@ + + # For modes: STANDARD, AUTH + adempiere.report.engine: + image: ${VUE_REPORT_GRPC_SERVER_IMAGE} + container_name: ${VUE_REPORT_GRPC_SERVER_CONTAINER_NAME} + hostname: ${VUE_REPORT_GRPC_SERVER_HOSTNAME} + restart: ${GENERIC_RESTART} + volumes: + - ${TIMEZONE_PATH_ON_HOST}:${TIMEZONE_PATH_ON_CONTAINER}:${TIMEZONE_OPTIONS} # Map the Timezone of the host to the Timezone of the container + - ${LOCALTIME_PATH_ON_HOST}:${LOCALTIME_PATH_ON_CONTAINER}:${LOCALTIME_OPTIONS} # Map the Localtime of the host to the Timezone of the container + healthcheck: + test: "bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/${VUE_REPORT_GRPC_SERVER_PORT}; exit $?;'" + interval: 10s + retries: 60 + start_period: 20s + timeout: 10s + depends_on: + postgresql.service: + condition: service_healthy + environment: + SERVER_PORT: ${VUE_REPORT_GRPC_SERVER_PORT} + DB_HOST: ${VUE_REPORT_GRPC_SERVER_DB_HOST} + DB_PORT: ${VUE_REPORT_GRPC_SERVER_DB_PORT} + DB_NAME: ${VUE_REPORT_GRPC_SERVER_DB_NAME} + DB_USER: ${VUE_REPORT_GRPC_SERVER_DB_USER} + DB_PASSWORD: ${VUE_REPORT_GRPC_SERVER_DB_PASSWORD} + SERVER_LOG_LEVEL: ${VUE_REPORT_GRPC_SERVER_LOG_LEVEL} + # ports: + # - ${VUE_REPORT_GRPC_SERVER_PORT} + networks: + - adempiere_network diff --git a/docker-compose/10b-grpc_proxy_service_develop.yml b/docker-compose/11b-grpc_proxy_service_develop.yml similarity index 100% rename from docker-compose/10b-grpc_proxy_service_develop.yml rename to docker-compose/11b-grpc_proxy_service_develop.yml diff --git a/docker-compose/10c-grpc_proxy_service_standard.yml b/docker-compose/11c-grpc_proxy_service_standard.yml similarity index 52% rename from docker-compose/10c-grpc_proxy_service_standard.yml rename to docker-compose/11c-grpc_proxy_service_standard.yml index b76e751f..11531e9b 100644 --- a/docker-compose/10c-grpc_proxy_service_standard.yml +++ b/docker-compose/11c-grpc_proxy_service_standard.yml @@ -1,36 +1,5 @@ # For modes: STANDARD, AUTH - adempiere.report.engine: - image: ${VUE_REPORT_GRPC_SERVER_IMAGE} - container_name: ${VUE_REPORT_GRPC_SERVER_CONTAINER_NAME} - hostname: ${VUE_REPORT_GRPC_SERVER_HOSTNAME} - restart: ${GENERIC_RESTART} - volumes: - - ${TIMEZONE_PATH_ON_HOST}:${TIMEZONE_PATH_ON_CONTAINER}:${TIMEZONE_OPTIONS} # Map the Timezone of the host to the Timezone of the container - - ${LOCALTIME_PATH_ON_HOST}:${LOCALTIME_PATH_ON_CONTAINER}:${LOCALTIME_OPTIONS} # Map the Localtime of the host to the Timezone of the container - healthcheck: - test: "bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/${VUE_REPORT_GRPC_SERVER_PORT}; exit $?;'" - interval: 10s - retries: 60 - start_period: 20s - timeout: 10s - depends_on: - postgresql.service: - condition: service_healthy - environment: - SERVER_PORT: ${VUE_REPORT_GRPC_SERVER_PORT} - DB_HOST: ${VUE_REPORT_GRPC_SERVER_DB_HOST} - DB_PORT: ${VUE_REPORT_GRPC_SERVER_DB_PORT} - DB_NAME: ${VUE_REPORT_GRPC_SERVER_DB_NAME} - DB_USER: ${VUE_REPORT_GRPC_SERVER_DB_USER} - DB_PASSWORD: ${VUE_REPORT_GRPC_SERVER_DB_PASSWORD} - SERVER_LOG_LEVEL: ${VUE_REPORT_GRPC_SERVER_LOG_LEVEL} - # ports: - # - ${VUE_REPORT_GRPC_SERVER_PORT} - networks: - - adempiere_network - - grpc.proxy: image: ${ENVOY_GRPC_PROXY_IMAGE} container_name: ${ENVOY_GRPC_PROXY_CONTAINER_NAME} diff --git a/docker-compose/10d-grpc_proxy_service_vue.yml b/docker-compose/11d-grpc_proxy_service_vue.yml similarity index 100% rename from docker-compose/10d-grpc_proxy_service_vue.yml rename to docker-compose/11d-grpc_proxy_service_vue.yml diff --git a/docker-compose/11a-vue_ui_service.yml b/docker-compose/12a-vue_ui_service.yml similarity index 100% rename from docker-compose/11a-vue_ui_service.yml rename to docker-compose/12a-vue_ui_service.yml diff --git a/docker-compose/12a-zookeeper_service.yml b/docker-compose/13a-zookeeper_service.yml similarity index 100% rename from docker-compose/12a-zookeeper_service.yml rename to docker-compose/13a-zookeeper_service.yml diff --git a/docker-compose/13a-kafka_service.yml b/docker-compose/14a-kafka_service.yml similarity index 100% rename from docker-compose/13a-kafka_service.yml rename to docker-compose/14a-kafka_service.yml diff --git a/docker-compose/13b-kafka_service_with_kafdrop.yml b/docker-compose/14b-kafka_service_with_kafdrop.yml similarity index 100% rename from docker-compose/13b-kafka_service_with_kafdrop.yml rename to docker-compose/14b-kafka_service_with_kafdrop.yml diff --git a/docker-compose/14a-opensearch_node_service_with_port.yml b/docker-compose/15a-opensearch_node_service_with_port.yml similarity index 100% rename from docker-compose/14a-opensearch_node_service_with_port.yml rename to docker-compose/15a-opensearch_node_service_with_port.yml diff --git a/docker-compose/14b-opensearch_node_service_without_port.yml b/docker-compose/15b-opensearch_node_service_without_port.yml similarity index 100% rename from docker-compose/14b-opensearch_node_service_without_port.yml rename to docker-compose/15b-opensearch_node_service_without_port.yml diff --git a/docker-compose/15a-opensearch_setup_service.yml b/docker-compose/16a-opensearch_setup_service.yml similarity index 100% rename from docker-compose/15a-opensearch_setup_service.yml rename to docker-compose/16a-opensearch_setup_service.yml diff --git a/docker-compose/16a-dictionary_rs_service_standard.yml b/docker-compose/17a-dictionary_rs_service_standard.yml similarity index 100% rename from docker-compose/16a-dictionary_rs_service_standard.yml rename to docker-compose/17a-dictionary_rs_service_standard.yml diff --git a/docker-compose/16c-dictionary_rs_service_develop.yml b/docker-compose/17c-dictionary_rs_service_develop.yml similarity index 100% rename from docker-compose/16c-dictionary_rs_service_develop.yml rename to docker-compose/17c-dictionary_rs_service_develop.yml diff --git a/docker-compose/17a-ui_gateway_service_auth.yml b/docker-compose/18a-ui_gateway_service_auth.yml similarity index 100% rename from docker-compose/17a-ui_gateway_service_auth.yml rename to docker-compose/18a-ui_gateway_service_auth.yml diff --git a/docker-compose/17b-ui_gateway_service_cache.yml b/docker-compose/18b-ui_gateway_service_cache.yml similarity index 100% rename from docker-compose/17b-ui_gateway_service_cache.yml rename to docker-compose/18b-ui_gateway_service_cache.yml diff --git a/docker-compose/17c-ui_gateway_service_develop.yml b/docker-compose/18c-ui_gateway_service_develop.yml similarity index 100% rename from docker-compose/17c-ui_gateway_service_develop.yml rename to docker-compose/18c-ui_gateway_service_develop.yml diff --git a/docker-compose/17d-ui_gateway_service_standard.yml b/docker-compose/18d-ui_gateway_service_standard.yml similarity index 100% rename from docker-compose/17d-ui_gateway_service_standard.yml rename to docker-compose/18d-ui_gateway_service_standard.yml diff --git a/docker-compose/17e-ui_gateway_service_storage.yml b/docker-compose/18e-ui_gateway_service_storage.yml similarity index 100% rename from docker-compose/17e-ui_gateway_service_storage.yml rename to docker-compose/18e-ui_gateway_service_storage.yml diff --git a/docker-compose/17f-ui_gateway_service_vue.yml b/docker-compose/18f-ui_gateway_service_vue.yml similarity index 100% rename from docker-compose/17f-ui_gateway_service_vue.yml rename to docker-compose/18f-ui_gateway_service_vue.yml diff --git a/docker-compose/18a-keycloak_service.yml b/docker-compose/19a-keycloak_service.yml similarity index 100% rename from docker-compose/18a-keycloak_service.yml rename to docker-compose/19a-keycloak_service.yml diff --git a/docker-compose/19a-opensearch_dashboards_service_with_port.yml b/docker-compose/20a-opensearch_dashboards_service_with_port.yml similarity index 100% rename from docker-compose/19a-opensearch_dashboards_service_with_port.yml rename to docker-compose/20a-opensearch_dashboards_service_with_port.yml diff --git a/docker-compose/start-all.sh b/docker-compose/start-all.sh index 029f762a..41223c21 100755 --- a/docker-compose/start-all.sh +++ b/docker-compose/start-all.sh @@ -58,16 +58,17 @@ ADEMPIERE_ZK=5 ADEMPIERE_PROCESSOR=6 DKRON_SCHEDULER=7 ADEMPIERE_GRPC_SERVER=8 -GRPC_PROXY=9 -VUE_UI=10 -ZOOKEEPER=11 -KAFKA=12 -OPENSEARCH_NODE=13 -OPENSEARCH_SETUP=14 -DICTIONARY_RS=15 -UI_GATEWAY=16 -KEYCLOAK=17 -OPENSEARCH_DASHBOARDS=18 +REPORT_ENGINE=9 +GRPC_PROXY=10 +VUE_UI=11 +ZOOKEEPER=12 +KAFKA=13 +OPENSEARCH_NODE=14 +OPENSEARCH_SETUP=15 +DICTIONARY_RS=16 +UI_GATEWAY=17 +KEYCLOAK=18 +OPENSEARCH_DASHBOARDS=19 NO_SERVICE_IMPLEMENTED=NO_SERVICE_IMPLEMENTED # 2b.- All services enumerated in the order the arrays are filled. @@ -75,7 +76,7 @@ NO_SERVICE_IMPLEMENTED=NO_SERVICE_IMPLEMENTED # (there is no way assotiated arrays can be ordered). # It will be used when looping through the selected services array. declare -a SERVICES_ordered_array -SERVICES_ordered_array=(POSTGRESQL_SERVICE S3_STORAGE S3_CLIENT S3_GATEWAY_RS ADEMPIERE_SITE ADEMPIERE_ZK ADEMPIERE_PROCESSOR DKRON_SCHEDULER ADEMPIERE_GRPC_SERVER GRPC_PROXY VUE_UI ZOOKEEPER KAFKA OPENSEARCH_NODE OPENSEARCH_SETUP DICTIONARY_RS UI_GATEWAY KEYCLOAK OPENSEARCH_DASHBOARDS) +SERVICES_ordered_array=(POSTGRESQL_SERVICE S3_STORAGE S3_CLIENT S3_GATEWAY_RS ADEMPIERE_SITE ADEMPIERE_ZK ADEMPIERE_PROCESSOR DKRON_SCHEDULER ADEMPIERE_GRPC_SERVER REPORT_ENGINE GRPC_PROXY VUE_UI ZOOKEEPER KAFKA OPENSEARCH_NODE OPENSEARCH_SETUP DICTIONARY_RS UI_GATEWAY KEYCLOAK OPENSEARCH_DASHBOARDS) # 2c.- Define arrays for service cases @@ -95,15 +96,17 @@ AUTH_array[$ADEMPIERE_ZK]="06a-adempiere_zk_service.yml" AUTH_array[$ADEMPIERE_PROCESSOR]="07a-adempiere_processor_service.yml" AUTH_array[$DKRON_SCHEDULER]="08a-dkron_scheduler_service.yml" AUTH_array[$ADEMPIERE_GRPC_SERVER]="09a-adempiere_grpc_server_service.yml" -AUTH_array[$GRPC_PROXY]="10c-grpc_proxy_service_standard.yml" -AUTH_array[$VUE_UI]="11a-vue_ui_service.yml" -AUTH_array[$ZOOKEEPER]="12a-zookeeper_service.yml" -AUTH_array[$KAFKA]="13a-kafka_service.yml" -AUTH_array[$OPENSEARCH_NODE]="14b-opensearch_node_service_without_port.yml" -AUTH_array[$OPENSEARCH_SETUP]="15a-opensearch_setup_service.yml" -AUTH_array[$DICTIONARY_RS]="16a-dictionary_rs_service_standard.yml" -AUTH_array[$UI_GATEWAY]="17a-ui_gateway_service_auth.yml" -AUTH_array[$KEYCLOAK]="18a-keycloak_service.yml" +AUTH_array[$REPORT_ENGINE]="10a-report_engine_service.yml" +AUTH_array[$GRPC_PROXY]="11c-grpc_proxy_service_standard.yml" +AUTH_array[$VUE_UI]="12a-vue_ui_service.yml" +AUTH_array[$ZOOKEEPER]="13a-zookeeper_service.yml" +AUTH_array[$KAFKA]="14a-kafka_service.yml" +AUTH_array[$OPENSEARCH_NODE]="15b-opensearch_node_service_without_port.yml" +AUTH_array[$OPENSEARCH_SETUP]="16a-opensearch_setup_service.yml" +AUTH_array[$DICTIONARY_RS]="17a-dictionary_rs_service_standard.yml" +AUTH_array[$UI_GATEWAY]="18a-ui_gateway_service_auth.yml" +AUTH_array[$KEYCLOAK]="19a-keycloak_service.yml" +AUTH_array[$OPENSEARCH_DASHBOARDS]="$NO_SERVICE_IMPLEMENTED" # Services for CACHE declare -a CACHE_array @@ -116,15 +119,17 @@ CACHE_array[$ADEMPIERE_ZK]="$NO_SERVICE_IMPLEMENTED" CACHE_array[$ADEMPIERE_PROCESSOR]="$NO_SERVICE_IMPLEMENTED" CACHE_array[$DKRON_SCHEDULER]="$NO_SERVICE_IMPLEMENTED" CACHE_array[$ADEMPIERE_GRPC_SERVER]="09a-adempiere_grpc_server_service.yml" -CACHE_array[$GRPC_PROXY]="10d-grpc_proxy_service_vue.yml" -CACHE_array[$VUE_UI]="11a-vue_ui_service.yml" -CACHE_array[$ZOOKEEPER]="12a-zookeeper_service.yml" -CACHE_array[$KAFKA]="13a-kafka_service.yml" -CACHE_array[$OPENSEARCH_NODE]="14a-opensearch_node_service_with_port.yml" -CACHE_array[$OPENSEARCH_SETUP]="15a-opensearch_setup_service.yml" -CACHE_array[$DICTIONARY_RS]="16a-dictionary_rs_service_standard.yml" -CACHE_array[$UI_GATEWAY]="17b-ui_gateway_service_cache.yml" +CACHE_array[$REPORT_ENGINE]="$NO_SERVICE_IMPLEMENTED" +CACHE_array[$GRPC_PROXY]="11d-grpc_proxy_service_vue.yml" +CACHE_array[$VUE_UI]="12a-vue_ui_service.yml" +CACHE_array[$ZOOKEEPER]="13a-zookeeper_service.yml" +CACHE_array[$KAFKA]="14a-kafka_service.yml" +CACHE_array[$OPENSEARCH_NODE]="15a-opensearch_node_service_with_port.yml" +CACHE_array[$OPENSEARCH_SETUP]="16a-opensearch_setup_service.yml" +CACHE_array[$DICTIONARY_RS]="17a-dictionary_rs_service_standard.yml" +CACHE_array[$UI_GATEWAY]="18b-ui_gateway_service_cache.yml" CACHE_array[$KEYCLOAK]="$NO_SERVICE_IMPLEMENTED" +CACHE_array[$OPENSEARCH_DASHBOARDS]="$NO_SERVICE_IMPLEMENTED" # Services for DEVELOP declare -a DEVELOP_array @@ -137,16 +142,17 @@ DEVELOP_array[$ADEMPIERE_ZK]="06a-adempiere_zk_service.yml" DEVELOP_array[$ADEMPIERE_PROCESSOR]="07a-adempiere_processor_service.yml" DEVELOP_array[$DKRON_SCHEDULER]="08a-dkron_scheduler_service.yml" DEVELOP_array[$ADEMPIERE_GRPC_SERVER]="09a-adempiere_grpc_server_service.yml" -DEVELOP_array[$GRPC_PROXY]="10b-grpc_proxy_service_develop.yml" -DEVELOP_array[$VUE_UI]="11a-vue_ui_service.yml" -DEVELOP_array[$ZOOKEEPER]="12a-zookeeper_service.yml" -DEVELOP_array[$KAFKA]="13b-kafka_service_with_kafdrop.yml" -DEVELOP_array[$OPENSEARCH_NODE]="14a-opensearch_node_service_with_port.yml" -DEVELOP_array[$OPENSEARCH_SETUP]="15a-opensearch_setup_service.yml" -DEVELOP_array[$DICTIONARY_RS]="16c-dictionary_rs_service_develop.yml" -DEVELOP_array[$UI_GATEWAY]="17c-ui_gateway_service_develop.yml" -DEVELOP_array[$KEYCLOAK]="18a-keycloak_service.yml" -DEVELOP_array[$OPENSEARCH_DASHBOARDS]="19a-opensearch_dashboards_service_with_port.yml" +DEVELOP_array[$REPORT_ENGINE]="$NO_SERVICE_IMPLEMENTED" +DEVELOP_array[$GRPC_PROXY]="11b-grpc_proxy_service_develop.yml" +DEVELOP_array[$VUE_UI]="12a-vue_ui_service.yml" +DEVELOP_array[$ZOOKEEPER]="13a-zookeeper_service.yml" +DEVELOP_array[$KAFKA]="14b-kafka_service_with_kafdrop.yml" +DEVELOP_array[$OPENSEARCH_NODE]="15a-opensearch_node_service_with_port.yml" +DEVELOP_array[$OPENSEARCH_SETUP]="16a-opensearch_setup_service.yml" +DEVELOP_array[$DICTIONARY_RS]="17c-dictionary_rs_service_develop.yml" +DEVELOP_array[$UI_GATEWAY]="18c-ui_gateway_service_develop.yml" +DEVELOP_array[$KEYCLOAK]="19a-keycloak_service.yml" +DEVELOP_array[$OPENSEARCH_DASHBOARDS]="20a-opensearch_dashboards_service_with_port.yml" # Services for STANDARD declare -a STANDARD_array @@ -159,15 +165,17 @@ STANDARD_array[$ADEMPIERE_ZK]="06a-adempiere_zk_service.yml" STANDARD_array[$ADEMPIERE_PROCESSOR]="07a-adempiere_processor_service.yml" STANDARD_array[$DKRON_SCHEDULER]="08a-dkron_scheduler_service.yml" STANDARD_array[$ADEMPIERE_GRPC_SERVER]="09a-adempiere_grpc_server_service.yml" -STANDARD_array[$GRPC_PROXY]="10c-grpc_proxy_service_standard.yml" -STANDARD_array[$VUE_UI]="11a-vue_ui_service.yml" -STANDARD_array[$ZOOKEEPER]="12a-zookeeper_service.yml" -STANDARD_array[$KAFKA]="13a-kafka_service.yml" -STANDARD_array[$OPENSEARCH_NODE]="14b-opensearch_node_service_without_port.yml" -STANDARD_array[$OPENSEARCH_SETUP]="15a-opensearch_setup_service.yml" -STANDARD_array[$DICTIONARY_RS]="16a-dictionary_rs_service_standard.yml" -STANDARD_array[$UI_GATEWAY]="17d-ui_gateway_service_standard.yml" +STANDARD_array[$REPORT_ENGINE]="10a-report_engine_service.yml" +STANDARD_array[$GRPC_PROXY]="11c-grpc_proxy_service_standard.yml" +STANDARD_array[$VUE_UI]="12a-vue_ui_service.yml" +STANDARD_array[$ZOOKEEPER]="13a-zookeeper_service.yml" +STANDARD_array[$KAFKA]="14a-kafka_service.yml" +STANDARD_array[$OPENSEARCH_NODE]="15b-opensearch_node_service_without_port.yml" +STANDARD_array[$OPENSEARCH_SETUP]="16a-opensearch_setup_service.yml" +STANDARD_array[$DICTIONARY_RS]="17a-dictionary_rs_service_standard.yml" +STANDARD_array[$UI_GATEWAY]="18d-ui_gateway_service_standard.yml" STANDARD_array[$KEYCLOAK]="$NO_SERVICE_IMPLEMENTED" +STANDARD_array[$OPENSEARCH_DASHBOARDS]="$NO_SERVICE_IMPLEMENTED" # Services for STORAGE declare -a STORAGE_array @@ -180,15 +188,17 @@ STORAGE_array[$ADEMPIERE_ZK]="$NO_SERVICE_IMPLEMENTED" STORAGE_array[$ADEMPIERE_PROCESSOR]="$NO_SERVICE_IMPLEMENTED" STORAGE_array[$DKRON_SCHEDULER]="$NO_SERVICE_IMPLEMENTED" STORAGE_array[$ADEMPIERE_GRPC_SERVER]="09a-adempiere_grpc_server_service.yml" -STORAGE_array[$GRPC_PROXY]="10d-grpc_proxy_service_vue.yml" -STORAGE_array[$VUE_UI]="11a-vue_ui_service.yml" +STORAGE_array[$REPORT_ENGINE]="$NO_SERVICE_IMPLEMENTED" +STORAGE_array[$GRPC_PROXY]="11d-grpc_proxy_service_vue.yml" +STORAGE_array[$VUE_UI]="12a-vue_ui_service.yml" STORAGE_array[$ZOOKEEPER]="$NO_SERVICE_IMPLEMENTED" STORAGE_array[$KAFKA]="$NO_SERVICE_IMPLEMENTED" STORAGE_array[$OPENSEARCH_NODE]="$NO_SERVICE_IMPLEMENTED" STORAGE_array[$OPENSEARCH_SETUP]="$NO_SERVICE_IMPLEMENTED" STORAGE_array[$DICTIONARY_RS]="$NO_SERVICE_IMPLEMENTED" -STORAGE_array[$UI_GATEWAY]="17e-ui_gateway_service_storage.yml" +STORAGE_array[$UI_GATEWAY]="18e-ui_gateway_service_storage.yml" STORAGE_array[$KEYCLOAK]="$NO_SERVICE_IMPLEMENTED" +STORAGE_array[$OPENSEARCH_DASHBOARDS]="$NO_SERVICE_IMPLEMENTED" # Services for VUE declare -a VUE_array @@ -201,15 +211,17 @@ VUE_array[$ADEMPIERE_ZK]="$NO_SERVICE_IMPLEMENTED" VUE_array[$ADEMPIERE_PROCESSOR]="$NO_SERVICE_IMPLEMENTED" VUE_array[$DKRON_SCHEDULER]="$NO_SERVICE_IMPLEMENTED" VUE_array[$ADEMPIERE_GRPC_SERVER]="09a-adempiere_grpc_server_service.yml" -VUE_array[$GRPC_PROXY]="10d-grpc_proxy_service_vue.yml" -VUE_array[$VUE_UI]="11a-vue_ui_service.yml" +VUE_array[$REPORT_ENGINE]="$NO_SERVICE_IMPLEMENTED" +VUE_array[$GRPC_PROXY]="11d-grpc_proxy_service_vue.yml" +VUE_array[$VUE_UI]="12a-vue_ui_service.yml" VUE_array[$ZOOKEEPER]="$NO_SERVICE_IMPLEMENTED" VUE_array[$KAFKA]="$NO_SERVICE_IMPLEMENTED" VUE_array[$OPENSEARCH_NODE]="$NO_SERVICE_IMPLEMENTED" VUE_array[$OPENSEARCH_SETUP]="$NO_SERVICE_IMPLEMENTED" VUE_array[$DICTIONARY_RS]="$NO_SERVICE_IMPLEMENTED" -VUE_array[$UI_GATEWAY]="17f-ui_gateway_service_vue.yml" +VUE_array[$UI_GATEWAY]="18f-ui_gateway_service_vue.yml" VUE_array[$KEYCLOAK]="$NO_SERVICE_IMPLEMENTED" +VUE_array[$OPENSEARCH_DASHBOARDS]="$NO_SERVICE_IMPLEMENTED" # All arrays that contain services have been defined. Now proceed to the creation of the docker compose file.