Commit c43aa594 authored by Dominik Pilár's avatar Dominik Pilár Committed by Tomáš Sapák
Browse files

Resolve "Integration of the graph-based visualization of walkthroughs"

parent 6ba8335d
......@@ -27,15 +27,15 @@ kypo_crp_docker_services:
sandbox_service:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-sandbox-service
image_tag: 'v0.15.0'
image_tag: 'v0.15.1'
training:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-training-service
image_tag: 'v1.1.75'
image_tag: 'v1.1.77'
adaptive_training:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-adaptive-training-service
image_tag: 'v1.0.41'
image_tag: 'v1.0.43'
smart_assistant:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-adaptive-smart-assistant-service
......@@ -44,6 +44,10 @@ kypo_crp_docker_services:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-answers-storage-service
image_tag: 'v1.0.6'
training_feedback:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-training-feedback-service
image_tag: 'v1.0.2'
elasticsearch_service:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-elasticsearch-service
......@@ -51,7 +55,7 @@ kypo_crp_docker_services:
frontend:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-frontend
image_tag: 'v12.0.9'
image_tag: 'v12.1.0'
elasticsearch:
container_name: kypo-elasticsearch
restart_policy: unless-stopped
......@@ -127,6 +131,11 @@ kypo_crp_answers_storage_service_context_path: /kypo-answers-storage/api/v1/
kypo_crp_answers_storage_service_url: '{{ kypo_crp_url }}{{ kypo_crp_answers_storage_service_context_path }}'
kypo_crp_answers_storage_service_internal_url: 'http://{{ kypo_crp_answers_storage_service_container_name }}:8087{{ kypo_crp_answers_storage_service_context_path }}'
kypo_crp_training_feedback_service_container_name: training-feedback
kypo_crp_training_feedback_service_context_path: /kypo-training-feedback/api/v1/
kypo_crp_training_feedback_service_url: '{{ kypo_crp_url }}{{ kypo_crp_training_feedback_service_context_path }}'
kypo_crp_training_feedback_service_internal_url: 'http://{{ kypo_crp_training_feedback_service_container_name }}:8088{{ kypo_crp_training_feedback_service_context_path }}'
kypo_crp_angular_frontend_container_name: angular-frontend
kypo_crp_angular_frontend_internal_url: 'http://{{ kypo_crp_angular_frontend_container_name }}:8000'
......
## server port for a given service, e.g., 8088
server.port=8088
## server context path (the base url for the service), e.g., /kypo-training-feedback/api/v1
server.servlet.context-path={{ kypo_crp_training_feedback_service_context_path }}
## microservice name which is used in user management service for identification of this service, e.g. kypo-training-feedback
microservice.name=kypo-training-feedback
## Allows you to specify allowed origins for CORS mapping. You could set it as, e.g., http://domain1.com, http://domain2.com, etc. The default value is: *
cors.allowed.origins={{ kypo_crp_url }}
# calling user-and-group project, e.g., https://localhost:8084/kypo-rest-user-and-group/api/v1
user-and-group-server.uri={{ kypo_crp_uag_service_internal_url }}
# calling kypo-elasticsearch-service, e.g., http://elastic-service:8085/kypo-elastic/api/v1
elasticsearch-service.uri={{ kypo_crp_elasticsearch_service_internal_url }}
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
spring.datasource.url=jdbc:postgresql://localhost:5432/kypo-training-feedback
spring.datasource.username=postgres
spring.datasource.password=postgres
spring.datasource.driver-class-name=org.postgresql.Driver
spring.jpa.open-in-view=false
#logging
spring.jpa.show-sql=true
logging.level.cz.muni.ics.kypo.training.feedback=DEBUG
......@@ -16,6 +16,8 @@ openstack-server.uri={{ kypo_crp_sandbox_service_internal_url }}
elasticsearch-service.uri={{ kypo_crp_elasticsearch_service_internal_url }}
# calling kypo-answers-storage, e.g., http://answers-storage:8087/kypo-answers-storage/api/v1
answers-storage.uri={{ kypo_crp_answers_storage_service_internal_url }}
# calling kypo-answers-storage, e.g., http://answers-storage:8087/kypo-answers-storage/api/v1
training-feedback-service.uri={{ kypo_crp_training_feedback_service_internal_url }}
# OpenID Connect OIDC configuration settings for a resource servers configuration
# Add configuration values for your OIDC providers. If you want to run the application properly, make sure that all values have a proper index.
......
......@@ -67,6 +67,14 @@ services:
- ./configuration/answers-storage-service/kypo-answers-storage.properties:/app/etc/kypo-answers-storage.properties
- {{ kypo_crp_java_cacerts_dest + ":/usr/local/openjdk-11/lib/security/cacerts" }}
- db_data_answers_storage:/var/lib/postgresql/11/main/
training-feedback:
image: {{ kypo_crp_docker_services.training_feedback.image + ":" + kypo_crp_docker_services.training_feedback.image_tag }}
container_name: {{ kypo_crp_training_feedback_service_container_name }}
restart: {{ kypo_crp_docker_services.training_feedback.restart_policy }}
volumes:
- ./configuration/training-feedback-service/kypo-training-feedback.properties:/app/etc/kypo-training-feedback.properties
- {{ kypo_crp_java_cacerts_dest + ":/usr/local/openjdk-11/lib/security/cacerts" }}
- db_data_training_feedback:/var/lib/postgresql/11/main/
elasticsearch-service:
image: {{ kypo_crp_docker_services.elasticsearch_service.image + ":" + kypo_crp_docker_services.elasticsearch_service.image_tag }}
container_name: {{ kypo_crp_elasticsearch_service_container_name }}
......@@ -111,6 +119,8 @@ volumes:
name: postgre-data-smart-assistant
db_data_answers_storage:
name: postgre-data-answers-storage
db_data_training_feedback:
name: postgre-data-training-feedback
db_data_sandbox_service:
name: postgre-data-sandbox-service
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment