From a49c35ac7dff6905367873e0fb488491ce8489f7 Mon Sep 17 00:00:00 2001 From: cruizba Date: Sun, 30 Oct 2022 13:16:59 +0100 Subject: [PATCH] deployment: Add speech to text service --- .../pro/docker-compose/media-node/beats/filebeat.yml | 4 ++++ .../pro/docker-compose/media-node/docker-compose.yml | 1 + .../pro/docker-compose/media-node/install_media_node.sh | 6 ++++++ .../deployments/pro/docker-compose/media-node/media_node | 1 + .../pro/docker-compose/mono-node/beats/filebeat.yml | 4 ++-- .../pro/docker-compose/mono-node/docker-compose.yml | 1 + .../deployments/pro/docker-compose/mono-node/openvidu | 1 + openvidu-test-e2e/jenkins/commonFunctions.groovy | 3 ++- 8 files changed, 18 insertions(+), 3 deletions(-) diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/beats/filebeat.yml b/openvidu-server/deployments/pro/docker-compose/media-node/beats/filebeat.yml index acbb63f5..4974492b 100644 --- a/openvidu-server/deployments/pro/docker-compose/media-node/beats/filebeat.yml +++ b/openvidu-server/deployments/pro/docker-compose/media-node/beats/filebeat.yml @@ -49,6 +49,10 @@ output: when.or: - contains: container.image.name: openvidu/openvidu-recording + - index: "filebeat-speech-to-text-%{+yyyy.MM.dd}" + when.or: + - contains: + container.image.name: openvidu/speech-to-text-service pipelines: - pipeline: kurento-pipeline when.or: diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/media-node/docker-compose.yml index 68917bf5..a906ec51 100644 --- a/openvidu-server/deployments/pro/docker-compose/media-node/docker-compose.yml +++ b/openvidu-server/deployments/pro/docker-compose/media-node/docker-compose.yml @@ -28,6 +28,7 @@ services: - FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0 - OPENVIDU_RECORDING_IMAGE=openvidu/openvidu-recording:2.23.0 - COTURN_IMAGE=openvidu/openvidu-coturn:2.23.0 + - SPEECH_TO_TEXT_IMAGE=openvidu/speech-to-text-service:2.24.0-beta1 - NO_COLOR=true ports: - 3000:3000 diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh b/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh index b7215585..1964df54 100755 --- a/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh +++ b/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh @@ -11,6 +11,7 @@ IMAGES=( "docker.elastic.co/beats/filebeat" "docker.elastic.co/beats/metricbeat" "openvidu/media-node-controller" + "openvidu/speech-to-text-service" "openvidu/mediasoup-controller" "openvidu/openvidu-coturn" ) @@ -113,11 +114,13 @@ new_media_node_installation() { METRICBEAT_IMAGE=$(grep METRICBEAT_IMAGE docker-compose.yml | cut -d"=" -f2) FILEBEAT_IMAGE=$(grep FILEBEAT_IMAGE docker-compose.yml | cut -d"=" -f2) OPENVIDU_RECORDING_IMAGE=$(grep OPENVIDU_RECORDING_IMAGE docker-compose.yml | cut -d"=" -f2) + SPEECH_TO_TEXT_IMAGE=$(grep SPEECH_TO_TEXT_IMAGE docker-compose.yml | cut -d"=" -f2) docker pull "$KMS_IMAGE" || fatal "Error while pulling docker image: $KMS_IMAGE" docker pull "$MEDIASOUP_IMAGE" || fatal "Error while pulling docker image: $MEDIASOUP_IMAGE" docker pull "$METRICBEAT_IMAGE" || fatal "Error while pulling docker image: $METRICBEAT_IMAGE" docker pull "$FILEBEAT_IMAGE" || fatal "Error while pulling docker image: $FILEBEAT_IMAGE" docker pull "$OPENVIDU_RECORDING_IMAGE" || fatal "Error while pulling docker image: $OPENVIDU_RECORDING_IMAGE" + docker pull "$SPEECH_TO_TEXT_IMAGE" || fatal "Error while pulling docker image: $SPEECH_TO_TEXT_IMAGE" docker-compose pull || true # Ready to use @@ -248,13 +251,16 @@ upgrade_media_node() { METRICBEAT_IMAGE="$(grep METRICBEAT_IMAGE docker-compose.yml | cut -d"=" -f2)" FILEBEAT_IMAGE="$(grep FILEBEAT_IMAGE docker-compose.yml | cut -d"=" -f2)" OPENVIDU_RECORDING_IMAGE="$(grep OPENVIDU_RECORDING_IMAGE docker-compose.yml | cut -d"=" -f2)" + SPEECH_TO_TEXT_IMAGE="$(grep SPEECH_TO_TEXT_IMAGE docker-compose.yml | cut -d"=" -f2)" COTURN_IMAGE="$(grep COTURN_IMAGE docker-compose.yml | cut -d"=" -f2)" + docker pull "$KMS_IMAGE" || fatal "Error while pulling docker image: $KMS_IMAGE" docker pull "$MEDIASOUP_IMAGE" || fatal "Error while pulling docker image: $MEDIASOUP_IMAGE" docker pull "$METRICBEAT_IMAGE" || fatal "Error while pulling docker image: $METRICBEAT_IMAGE" docker pull "$FILEBEAT_IMAGE" || fatal "Error while pulling docker image: $FILEBEAT_IMAGE" docker pull "$OPENVIDU_RECORDING_IMAGE" || fatal "Error while pulling docker image: $OPENVIDU_RECORDING_IMAGE" docker pull "$COTURN_IMAGE" || fatal "Error while pulling docker image: $COTURN_IMAGE" + docker pull "$SPEECH_TO_TEXT_IMAGE" || fatal "Error while pulling docker image: $SPEECH_TO_TEXT_IMAGE" docker-compose pull || true printf '\n => Stopping Media Node...' diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/media_node b/openvidu-server/deployments/pro/docker-compose/media-node/media_node index 0f3dc728..b99ccf71 100755 --- a/openvidu-server/deployments/pro/docker-compose/media-node/media_node +++ b/openvidu-server/deployments/pro/docker-compose/media-node/media_node @@ -17,6 +17,7 @@ IMAGES=( "docker.elastic.co/beats/filebeat" "docker.elastic.co/beats/metricbeat" "openvidu/media-node-controller" + "openvidu/speech-to-text-service" "openvidu/mediasoup-controller" "openvidu/openvidu-coturn" ) diff --git a/openvidu-server/deployments/pro/docker-compose/mono-node/beats/filebeat.yml b/openvidu-server/deployments/pro/docker-compose/mono-node/beats/filebeat.yml index 2e2824b7..ba0fb35d 100644 --- a/openvidu-server/deployments/pro/docker-compose/mono-node/beats/filebeat.yml +++ b/openvidu-server/deployments/pro/docker-compose/mono-node/beats/filebeat.yml @@ -73,10 +73,10 @@ output: when.or: - contains: container.image.name: openvidu/openvidu-proxy - - index: "filebeat-openvidu-recording-%{+yyyy.MM.dd}" + - index: "filebeat-speech-to-text-%{+yyyy.MM.dd}" when.or: - contains: - container.image.name: openvidu/openvidu-recording + container.image.name: openvidu/speech-to-text pipelines: - pipeline: kurento-pipeline when.or: diff --git a/openvidu-server/deployments/pro/docker-compose/mono-node/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/mono-node/docker-compose.yml index 7aabe224..a702ff95 100644 --- a/openvidu-server/deployments/pro/docker-compose/mono-node/docker-compose.yml +++ b/openvidu-server/deployments/pro/docker-compose/mono-node/docker-compose.yml @@ -161,6 +161,7 @@ services: - METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0 - FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0 - OPENVIDU_RECORDING_IMAGE=openvidu/openvidu-recording:2.23.0 + - SPEECH_TO_TEXT_IMAGE=openvidu/speech-to-text:2.24.0-beta1 - COTURN_IMAGE=openvidu/openvidu-coturn:2.23.0 - NO_COLOR=true ports: diff --git a/openvidu-server/deployments/pro/docker-compose/mono-node/openvidu b/openvidu-server/deployments/pro/docker-compose/mono-node/openvidu index 62c16914..fdbe0faa 100755 --- a/openvidu-server/deployments/pro/docker-compose/mono-node/openvidu +++ b/openvidu-server/deployments/pro/docker-compose/mono-node/openvidu @@ -17,6 +17,7 @@ IMAGES=( "docker.elastic.co/beats/filebeat" "docker.elastic.co/beats/metricbeat" "openvidu/media-node-controller" + "openvidu/speech-to-text" "openvidu/mediasoup-controller" "openvidu/openvidu-coturn" ) diff --git a/openvidu-test-e2e/jenkins/commonFunctions.groovy b/openvidu-test-e2e/jenkins/commonFunctions.groovy index 5f4dfaf1..e69a39f6 100644 --- a/openvidu-test-e2e/jenkins/commonFunctions.groovy +++ b/openvidu-test-e2e/jenkins/commonFunctions.groovy @@ -139,7 +139,8 @@ def removeStrandedContainers(removeTestingContainers) { "docker.elastic.co/beats/filebeat-oss:" "openvidu/openvidu-pro-dind-media-node:" "kurento/kurento-media-server" - "openvidu/media-node-controller:") + "openvidu/media-node-controller:" + "openvidu/speech-to-text:") if [ "${removeTestingContainers}" == "true" ]; then arr+=("openvidu/openvidu-test-e2e:") arr+=("openvidu/openvidu-pro-test-e2e:")