Commit 13da22e4 authored by Kamil Andoniadis's avatar Kamil Andoniadis
Browse files

Merge branch '118-release-21-04' into 'master'

Resolve "Release 21.04"

Closes #118

See merge request muni-kypo-crp/devops/kypo-crp-deployment!125
parents 990eb29a e97840f8
......@@ -23,31 +23,31 @@ kypo_crp_docker_services:
user_and_group:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-uag-service
image_tag: 'v1.1.76'
image_tag: '21.04'
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.7.2'
image_tag: '21.04'
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.62'
image_tag: '21.04'
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.33'
image_tag: '21.04'
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
image_tag: 'v1.0.23'
image_tag: '21.04'
elasticsearch_service:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-elasticsearch-service
image_tag: 'v1.0.26'
image_tag: '21.04'
frontend:
restart_policy: unless-stopped
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-frontend
image_tag: 'v11.1.4'
image_tag: '21.04'
elasticsearch:
container_name: kypo-elasticsearch
restart_policy: unless-stopped
......@@ -77,7 +77,7 @@ kypo_crp_docker_services:
image_tag: master
ansible_runner:
image: registry.gitlab.ics.muni.cz:443/muni-kypo-crp/kypo-crp-artifact-repository/kypo-ansible-runner
image_tag: '21.03'
image_tag: '21.04'
kypo_crp_oidc_post_logout_url: '{{ kypo_crp_url }}/logout-confirmed'
kypo_crp_oidc_silent_refresh_redirect_url: '{{ kypo_crp_url }}/silent-refresh.html'
......
......@@ -5,7 +5,8 @@
roles:
- name: kypo-crp-git-internal
- name: kypo-crp-syslog-ng
- name: syslog-ng
syslog_ng_docker_network_name: '{{ kypo_crp_docker_network_name }}'
- name: kypo-crp-elk
- name: kypo-crp-configuration
- name: kypo-crp-run
......
---
- src: https://gitlab.ics.muni.cz/muni-kypo-crp/useful-ansible-roles/kypo-crp-syslog-ng.git
- src: https://gitlab.ics.muni.cz/muni-kypo/ansible-roles/syslog-ng.git
scm: git
version: master
version: 1.0.0
- src: https://gitlab.ics.muni.cz/muni-kypo/ansible-roles/elk.git
scm: git
version: 1.0.0
- src: https://gitlab.ics.muni.cz/muni-kypo/ansible-roles/docker-compose.git
scm: git
version: 1.0.1
# Name of the microservice.
#microservice_name: kypo-sandbox-service
# A prefix of the stack in the cloud.
# A prefix of the stack in the cloud with maximum 8 characters.
stack_name_prefix: {{ kypo_crp_instance_name }}
# A boolean that turns on/off debug mode.
......@@ -77,7 +77,7 @@ application_configuration:
# The rev of Ansible networking Git repository.
ansible_networking_rev: {{ kypo_crp_git.ansible_networking_rev }}
# The object that represents SSH Host entry. Every attribute is one SSH option (see man page of ssh_config). If you do not use proxy jump, do not set this variable.
# The object that represents SSH Host entry (see man page of ssh_config).
proxy_jump_to_man:
Host: {{ kypo_crp_proxy_host }}
User: {{ kypo_crp_proxy_user }}
......
dependencies:
- src: git+https://gitlab.ics.muni.cz/muni-kypo-crp/useful-ansible-roles/docker-compose.git
version: master
name: docker-compose
- docker-compose
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