mirror of https://github.com/OpenVidu/openvidu.git
Bump ubuntu to noble. Bump kurento-media-server to 7.1.1
parent
a805b3d8b3
commit
40ed3b5dbe
|
@ -16,7 +16,7 @@ on:
|
|||
TEST_IMAGE:
|
||||
description: "Docker image where to run the tests"
|
||||
required: true
|
||||
default: "openvidu/openvidu-test-e2e:22.04"
|
||||
default: "openvidu/openvidu-test-e2e:24.04"
|
||||
KURENTO_JAVA_COMMIT:
|
||||
description: 'Commit to use in kurento-java dependencies. If "default" the release version declared in property "version.kurento" of openvidu-parent/pom.xml will be used'
|
||||
required: true
|
||||
|
@ -24,7 +24,7 @@ on:
|
|||
KURENTO_MEDIA_SERVER_IMAGE:
|
||||
description: "Docker image of kurento-media-server"
|
||||
required: true
|
||||
default: "kurento/kurento-media-server:7.0.1"
|
||||
default: "kurento/kurento-media-server:7.1.1"
|
||||
DOCKER_RECORDING_VERSION:
|
||||
description: "Force version of openvidu/openvidu-recording container"
|
||||
required: true
|
||||
|
@ -45,14 +45,14 @@ jobs:
|
|||
main:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ${{ inputs.TEST_IMAGE || 'openvidu/openvidu-test-e2e:22.04' }}
|
||||
image: ${{ inputs.TEST_IMAGE || 'openvidu/openvidu-test-e2e:24.04' }}
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- /opt/openvidu:/opt/openvidu
|
||||
env:
|
||||
TEST_IMAGE: ${{ inputs.TEST_IMAGE || 'openvidu/openvidu-test-e2e:22.04' }}
|
||||
TEST_IMAGE: ${{ inputs.TEST_IMAGE || 'openvidu/openvidu-test-e2e:24.04' }}
|
||||
KURENTO_SNAPSHOTS_URL: ${{ secrets.KURENTO_SNAPSHOTS_URL }}
|
||||
KURENTO_MEDIA_SERVER_IMAGE: ${{ inputs.KURENTO_MEDIA_SERVER_IMAGE || 'kurento/kurento-media-server:7.0.1' }}
|
||||
KURENTO_MEDIA_SERVER_IMAGE: ${{ inputs.KURENTO_MEDIA_SERVER_IMAGE || 'kurento/kurento-media-server:7.1.1' }}
|
||||
KURENTO_JAVA_COMMIT: ${{ inputs.KURENTO_JAVA_COMMIT || 'default' }}
|
||||
DOCKER_RECORDING_VERSION: ${{ inputs.DOCKER_RECORDING_VERSION || 'default' }}
|
||||
CHROME_VERSION: ${{ inputs.CHROME_VERSION || 'latest' }}
|
||||
|
|
|
@ -355,7 +355,7 @@ Resources:
|
|||
BlockDeviceMappings:
|
||||
- DeviceName: /dev/sda1
|
||||
Ebs:
|
||||
VolumeType: gp2
|
||||
VolumeType: gp3
|
||||
DeleteOnTermination: true
|
||||
VolumeSize: 200
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
|
|||
getUbuntuAmiId() {
|
||||
local AMI_ID=$(
|
||||
aws --region ${1} ec2 describe-images \
|
||||
--filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*" \
|
||||
--filters "Name=name,Values=*ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*" \
|
||||
"Name=owner-alias,Values=amazon" \
|
||||
--query "sort_by(Images, &CreationDate)" |
|
||||
jq -r '.[-1].ImageId'
|
||||
|
|
|
@ -176,7 +176,7 @@ OPENVIDU_CDR_PATH=/opt/openvidu/cdr
|
|||
# --------------------------
|
||||
# Docker hub kurento media server: https://hub.docker.com/r/kurento/kurento-media-server
|
||||
# Uncomment the next line and define this variable with KMS image that you want use
|
||||
# KMS_IMAGE=kurento/kurento-media-server:7.0.1
|
||||
# KMS_IMAGE=kurento/kurento-media-server:7.1.1
|
||||
|
||||
# Kurento Media Server Level logs
|
||||
# -------------------------------
|
||||
|
|
|
@ -45,7 +45,7 @@ services:
|
|||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||
|
||||
kms:
|
||||
image: ${KMS_IMAGE:-kurento/kurento-media-server:7.0.1}
|
||||
image: ${KMS_IMAGE:-kurento/kurento-media-server:7.1.1}
|
||||
restart: always
|
||||
network_mode: host
|
||||
ulimits:
|
||||
|
|
|
@ -134,7 +134,7 @@ services:
|
|||
core: -1
|
||||
environment:
|
||||
- MEDIA_NODE_CONTROLLER_RECORDINGS_PATH=/opt/openvidu/mncontroller/recordings
|
||||
- KMS_IMAGE=kurento/kurento-media-server:7.0.1
|
||||
- KMS_IMAGE=kurento/kurento-media-server:7.1.1
|
||||
- MEDIASOUP_IMAGE=openvidu/mediasoup-controller:2.30.0
|
||||
- METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0
|
||||
- FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0
|
||||
|
|
|
@ -744,7 +744,7 @@ Resources:
|
|||
BlockDeviceMappings:
|
||||
- DeviceName: /dev/sda1
|
||||
Ebs:
|
||||
VolumeType: gp2
|
||||
VolumeType: gp3
|
||||
DeleteOnTermination: true
|
||||
VolumeSize: 50
|
||||
|
||||
|
@ -1005,7 +1005,7 @@ Resources:
|
|||
BlockDeviceMappings:
|
||||
- DeviceName: /dev/sda1
|
||||
Ebs:
|
||||
VolumeType: gp2
|
||||
VolumeType: gp3
|
||||
DeleteOnTermination: true
|
||||
VolumeSize: 100
|
||||
UserData:
|
||||
|
|
|
@ -254,7 +254,7 @@ Resources:
|
|||
BlockDeviceMappings:
|
||||
- DeviceName: /dev/sda1
|
||||
Ebs:
|
||||
VolumeType: gp2
|
||||
VolumeType: gp3
|
||||
DeleteOnTermination: true
|
||||
VolumeSize: 10
|
||||
UserData:
|
||||
|
|
|
@ -18,7 +18,7 @@ TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
|
|||
getUbuntuAmiId() {
|
||||
local AMI_ID=$(
|
||||
aws --region ${1} ec2 describe-images \
|
||||
--filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*" \
|
||||
--filters "Name=name,Values=*ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*" \
|
||||
"Name=owner-alias,Values=amazon" \
|
||||
--query "sort_by(Images, &CreationDate)" |
|
||||
jq -r '.[-1].ImageId'
|
||||
|
|
|
@ -251,7 +251,7 @@ Resources:
|
|||
BlockDeviceMappings:
|
||||
- DeviceName: /dev/sda1
|
||||
Ebs:
|
||||
VolumeType: gp2
|
||||
VolumeType: gp3
|
||||
DeleteOnTermination: true
|
||||
VolumeSize: 10
|
||||
UserData:
|
||||
|
|
|
@ -17,7 +17,7 @@ TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
|
|||
getUbuntuAmiId() {
|
||||
local AMI_ID=$(
|
||||
aws --region ${1} ec2 describe-images \
|
||||
--filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*" \
|
||||
--filters "Name=name,Values=*ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*" \
|
||||
"Name=owner-alias,Values=amazon" \
|
||||
--query "sort_by(Images, &CreationDate)" |
|
||||
jq -r '.[-1].ImageId'
|
||||
|
|
|
@ -47,7 +47,7 @@ TEMP_JSON_ES_EBS_OPT=$(mktemp -t es-ebs-XXX --suffix .json)
|
|||
cat > "$TEMP_JSON_ES_EBS_OPT"<<EOF
|
||||
{
|
||||
"EBSEnabled": true,
|
||||
"VolumeType": "gp2",
|
||||
"VolumeType": "gp3",
|
||||
"VolumeSize": 10
|
||||
}
|
||||
EOF
|
||||
|
|
|
@ -379,7 +379,7 @@ ELASTICSEARCH_PASSWORD=
|
|||
# Uncomment the next line and define this variable with KMS image that you want use
|
||||
# By default, KMS_IMAGE is defined in media nodes and it does not need to be specified unless
|
||||
# you want to use a specific version of KMS
|
||||
# KMS_IMAGE=kurento/kurento-media-server:7.0.1
|
||||
# KMS_IMAGE=kurento/kurento-media-server:7.1.1
|
||||
|
||||
# Uncomment the next line and define this variable to change
|
||||
# the verbosity level of the logs of KMS
|
||||
|
|
|
@ -50,7 +50,7 @@ docker run --rm amazon/aws-cli:${AWS_CLI_DOCKER_TAG} ec2 run-instances \
|
|||
--subnet-id ${AWS_SUBNET_ID} \
|
||||
--tag-specifications "ResourceType=instance,Tags=[{Key='Name',Value='Media Node'},{Key='ov-cluster-member',Value='kms'},{Key='ov-stack-name',Value='${AWS_STACK_NAME}'},{Key='ov-stack-region',Value='${AWS_DEFAULT_REGION}'}]" \
|
||||
--iam-instance-profile Name="OpenViduInstanceProfile-${AWS_STACK_NAME}-${AWS_DEFAULT_REGION}" \
|
||||
--block-device-mappings "DeviceName=/dev/sda1,Ebs={DeleteOnTermination=True,VolumeType='gp2',VolumeSize='${AWS_VOLUME_SIZE}'}" \
|
||||
--block-device-mappings "DeviceName=/dev/sda1,Ebs={DeleteOnTermination=True,VolumeType='gp3',VolumeSize='${AWS_VOLUME_SIZE}'}" \
|
||||
--security-group-ids ${AWS_SECURITY_GROUP} > ${OUTPUT} 2> ${ERROUTPUT}
|
||||
|
||||
docker run --rm amazon/aws-cli:${AWS_CLI_DOCKER_TAG} ec2 wait instance-running --instance-ids $(cat ${OUTPUT} | jq --raw-output ' .Instances[] | .InstanceId')
|
||||
|
|
|
@ -174,7 +174,7 @@ Resources:
|
|||
Type: Custom::FindAMI
|
||||
Properties:
|
||||
ServiceToken: !Sub ${GetLatestUbuntuAmi.Arn}
|
||||
Name: "*ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*"
|
||||
Name: "*ubuntu/images/hvm-ssd/ubuntu-noble-24.04-amd64-server-*"
|
||||
|
||||
TurnServerInstance:
|
||||
Type: 'AWS::EC2::Instance'
|
||||
|
@ -314,7 +314,7 @@ Resources:
|
|||
BlockDeviceMappings:
|
||||
- DeviceName: /dev/sda1
|
||||
Ebs:
|
||||
VolumeType: gp2
|
||||
VolumeType: gp3
|
||||
DeleteOnTermination: true
|
||||
VolumeSize: 25
|
||||
|
||||
|
|
|
@ -768,7 +768,7 @@ Resources:
|
|||
BlockDeviceMappings:
|
||||
- DeviceName: /dev/sda1
|
||||
Ebs:
|
||||
VolumeType: gp2
|
||||
VolumeType: gp3
|
||||
DeleteOnTermination: true
|
||||
VolumeSize: 200
|
||||
|
||||
|
|
|
@ -175,7 +175,7 @@ Resources:
|
|||
BlockDeviceMappings:
|
||||
- DeviceName: /dev/sda1
|
||||
Ebs:
|
||||
VolumeType: gp2
|
||||
VolumeType: gp3
|
||||
DeleteOnTermination: true
|
||||
VolumeSize: 10
|
||||
Tags:
|
||||
|
|
|
@ -137,7 +137,7 @@ Resources:
|
|||
BlockDeviceMappings:
|
||||
- DeviceName: /dev/sda1
|
||||
Ebs:
|
||||
VolumeType: gp2
|
||||
VolumeType: gp3
|
||||
DeleteOnTermination: true
|
||||
VolumeSize: 10
|
||||
UserData:
|
||||
|
|
|
@ -24,7 +24,7 @@ TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
|
|||
getUbuntuAmiId() {
|
||||
local AMI_ID=$(
|
||||
aws --region ${1} ec2 describe-images \
|
||||
--filters "Name=name,Values=*ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*" \
|
||||
--filters "Name=name,Values=*ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*" \
|
||||
"Name=owner-alias,Values=amazon" \
|
||||
--query "sort_by(Images, &CreationDate)" |
|
||||
jq -r '.[-1].ImageId'
|
||||
|
|
|
@ -22,7 +22,7 @@ services:
|
|||
core: -1
|
||||
entrypoint: ['/bin/sh', '-c', '/beats/copy_config_files.sh && /usr/local/bin/entrypoint.sh']
|
||||
environment:
|
||||
- KMS_IMAGE=kurento/kurento-media-server:7.0.1
|
||||
- KMS_IMAGE=kurento/kurento-media-server:7.1.1
|
||||
- MEDIASOUP_IMAGE=openvidu/mediasoup-controller:2.30.0
|
||||
- METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0
|
||||
- FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0
|
||||
|
|
|
@ -332,7 +332,7 @@ ELASTICSEARCH_PASSWORD=
|
|||
# Uncomment the next line and define this variable with KMS image that you want use
|
||||
# By default, KMS_IMAGE is defined in media nodes and it does not need to be specified unless
|
||||
# you want to use a specific version of KMS
|
||||
# KMS_IMAGE=kurento/kurento-media-server:7.0.1
|
||||
# KMS_IMAGE=kurento/kurento-media-server:7.1.1
|
||||
|
||||
# Uncomment the next line and define this variable to change
|
||||
# the verbosity level of the logs of KMS
|
||||
|
|
|
@ -157,7 +157,7 @@ services:
|
|||
core: -1
|
||||
environment:
|
||||
- MEDIA_NODE_CONTROLLER_RECORDINGS_PATH=/opt/openvidu/mncontroller/recordings
|
||||
- KMS_IMAGE=kurento/kurento-media-server:7.0.1
|
||||
- KMS_IMAGE=kurento/kurento-media-server:7.1.1
|
||||
- MEDIASOUP_IMAGE=openvidu/mediasoup-controller:2.30.0
|
||||
- METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0
|
||||
- FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0
|
||||
|
|
|
@ -375,7 +375,7 @@ ELASTICSEARCH_PASSWORD=
|
|||
# Uncomment the next line and define this variable with KMS image that you want use
|
||||
# By default, KMS_IMAGE is defined in media nodes and it does not need to be specified unless
|
||||
# you want to use a specific version of KMS
|
||||
# KMS_IMAGE=kurento/kurento-media-server:7.0.1
|
||||
# KMS_IMAGE=kurento/kurento-media-server:7.1.1
|
||||
|
||||
# Uncomment the next line and define this variable to change
|
||||
# the verbosity level of the logs of KMS
|
||||
|
|
|
@ -50,7 +50,7 @@ docker run --rm amazon/aws-cli:"${AWS_CLI_DOCKER_TAG}" ec2 run-instances \
|
|||
--subnet-id "${AWS_SUBNET_ID}" \
|
||||
--tag-specifications "ResourceType=instance,Tags=[{Key='Name',Value='OpenVidu Pro Media Node'},{Key='ov-cluster-member',Value='kms'},{Key='ov-stack-name',Value='${AWS_STACK_NAME}'},{Key='ov-stack-region',Value='${AWS_DEFAULT_REGION}'}]" \
|
||||
--iam-instance-profile Name="OpenViduInstanceProfile-${AWS_STACK_NAME}-${AWS_DEFAULT_REGION}" \
|
||||
--block-device-mappings "DeviceName=/dev/sda1,Ebs={DeleteOnTermination=True,VolumeType='gp2',VolumeSize='${AWS_VOLUME_SIZE}'}" \
|
||||
--block-device-mappings "DeviceName=/dev/sda1,Ebs={DeleteOnTermination=True,VolumeType='gp3',VolumeSize='${AWS_VOLUME_SIZE}'}" \
|
||||
--security-group-ids "${AWS_SECURITY_GROUP}" > "${OUTPUT}" 2> "${ERROUTPUT}"
|
||||
|
||||
docker run --rm amazon/aws-cli:"${AWS_CLI_DOCKER_TAG}" ec2 wait instance-running --instance-ids $(cat ${OUTPUT} | jq --raw-output ' .Instances[] | .InstanceId')
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:22.04
|
||||
FROM ubuntu:24.04
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive \
|
||||
DISPLAY :99.0 \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:20.04
|
||||
FROM ubuntu:24.04
|
||||
LABEL maintainer="info@openvidu.io"
|
||||
|
||||
# Update and install dependencies
|
||||
|
@ -7,7 +7,7 @@ RUN apt-get update && apt-get -y upgrade && \
|
|||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Kurento Media Server (KMS)
|
||||
RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/7.0.1 focal main" | tee /etc/apt/sources.list.d/kurento.list && \
|
||||
RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/7.1.1 noble main" | tee /etc/apt/sources.list.d/kurento.list && \
|
||||
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83 && \
|
||||
apt-get update && \
|
||||
apt-get -y install kurento-media-server && \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:22.04
|
||||
FROM ubuntu:24.04
|
||||
LABEL maintainer="OpenVidu info@openvidu.io"
|
||||
|
||||
# Install packages
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:20.04
|
||||
FROM ubuntu:24.04
|
||||
MAINTAINER info@openvidu.io
|
||||
|
||||
# Install packages
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:22.04
|
||||
FROM ubuntu:24.04
|
||||
MAINTAINER info@openvidu.io
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:22.04
|
||||
FROM ubuntu:24.04
|
||||
MAINTAINER info@openvidu.io
|
||||
|
||||
# Install Java, supervisor and netstat
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:22.04
|
||||
FROM ubuntu:24.04
|
||||
|
||||
LABEL maintainer="info@openvidu.io"
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e:22.04 -f Dockerfile .
|
||||
docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e:24.04 -f Dockerfile .
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM openvidu/openvidu-test-e2e:22.04
|
||||
FROM openvidu/openvidu-test-e2e:24.04
|
||||
|
||||
RUN apt-get -y update && \
|
||||
apt-get install -y wget unzip
|
||||
|
|
|
@ -1 +1 @@
|
|||
docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e-android:22.04 -f Dockerfile .
|
||||
docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e-android:24.04 -f Dockerfile .
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -44,7 +44,7 @@
|
|||
<properties>
|
||||
|
||||
<version.spring-boot>2.7.18</version.spring-boot>
|
||||
<version.kurento>7.0.1-SNAPSHOT</version.kurento>
|
||||
<version.kurento>7.1.0</version.kurento>
|
||||
<version.openvidu.java.client>2.30.0</version.openvidu.java.client>
|
||||
<version.openvidu.client>1.1.0</version.openvidu.client>
|
||||
<version.openvidu.test.browsers>1.1.0</version.openvidu.test.browsers>
|
||||
|
|
Loading…
Reference in New Issue