From 40ed3b5dbe602fc0d29a32d10213b5fac56fce26 Mon Sep 17 00:00:00 2001 From: cruizba Date: Wed, 8 Jan 2025 12:34:28 +0100 Subject: [PATCH] Bump ubuntu to noble. Bump kurento-media-server to 7.1.1 --- .github/workflows/openvidu-ce-test.yml | 10 +++++----- .../deployments/ce/aws/CF-OpenVidu.yaml.template | 2 +- openvidu-server/deployments/ce/aws/createAMI.sh | 2 +- openvidu-server/deployments/ce/docker-compose/.env | 2 +- .../deployments/ce/docker-compose/docker-compose.yml | 2 +- .../docker-compose/node/docker-compose.yml | 2 +- .../aws/CF-OpenVidu-Enterprise.yaml.template | 4 ++-- .../aws/cfn-crete-ov-aws-asg-ami.yaml.template | 2 +- .../deployments/enterprise/aws/createAMI.sh | 2 +- .../aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template | 2 +- .../deployments/enterprise/aws/dev/createAMI.sh | 2 +- .../deployments/enterprise/aws/dev/deploy_cf.sh | 2 +- .../deployments/enterprise/docker-compose/.env | 2 +- .../docker-compose/cluster/aws/openvidu_launch_kms.sh | 2 +- .../deployments/external-turn/aws/CF-External-Turn.yml | 4 ++-- .../deployments/pro/aws/CF-OpenVidu-Pro.yaml.template | 2 +- .../deployments/pro/aws/cfn-mkt-kms-ami.yaml.template | 2 +- .../deployments/pro/aws/cfn-mkt-ov-ami.yaml.template | 2 +- openvidu-server/deployments/pro/aws/createAMI.sh | 2 +- .../pro/docker-compose/media-node/docker-compose.yml | 2 +- .../deployments/pro/docker-compose/mono-node/.env | 2 +- .../pro/docker-compose/mono-node/docker-compose.yml | 2 +- .../pro/docker-compose/openvidu-server-pro/.env | 2 +- .../cluster/aws/openvidu_launch_kms.sh | 2 +- .../docker/openvidu-deployment-tester/Dockerfile | 4 ++-- openvidu-server/docker/openvidu-dev/Dockerfile | 4 ++-- openvidu-server/docker/openvidu-recording/Dockerfile | 2 +- .../docker/openvidu-recording/firefox/Dockerfile | 2 +- openvidu-server/docker/openvidu-server-pro/Dockerfile | 2 +- openvidu-server/docker/openvidu-server/Dockerfile | 2 +- openvidu-test-e2e/docker/Dockerfile | 2 +- openvidu-test-e2e/docker/create_image.sh | 2 +- .../docker/openvidu-test-e2e-android/Dockerfile | 4 ++-- .../docker/openvidu-test-e2e-android/create_image.sh | 2 +- pom.xml | 4 ++-- 35 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/openvidu-ce-test.yml b/.github/workflows/openvidu-ce-test.yml index caf374fd..8aa65413 100644 --- a/.github/workflows/openvidu-ce-test.yml +++ b/.github/workflows/openvidu-ce-test.yml @@ -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' }} diff --git a/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template b/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template index 038104e8..252fa26b 100644 --- a/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template +++ b/openvidu-server/deployments/ce/aws/CF-OpenVidu.yaml.template @@ -355,7 +355,7 @@ Resources: BlockDeviceMappings: - DeviceName: /dev/sda1 Ebs: - VolumeType: gp2 + VolumeType: gp3 DeleteOnTermination: true VolumeSize: 200 diff --git a/openvidu-server/deployments/ce/aws/createAMI.sh b/openvidu-server/deployments/ce/aws/createAMI.sh index cf68c179..17c6279c 100755 --- a/openvidu-server/deployments/ce/aws/createAMI.sh +++ b/openvidu-server/deployments/ce/aws/createAMI.sh @@ -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' diff --git a/openvidu-server/deployments/ce/docker-compose/.env b/openvidu-server/deployments/ce/docker-compose/.env index 6544bdd8..ccf0be68 100644 --- a/openvidu-server/deployments/ce/docker-compose/.env +++ b/openvidu-server/deployments/ce/docker-compose/.env @@ -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 # ------------------------------- diff --git a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml index 5b57bab8..c2fc489a 100644 --- a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml +++ b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml @@ -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: diff --git a/openvidu-server/deployments/enterprise-ha/docker-compose/node/docker-compose.yml b/openvidu-server/deployments/enterprise-ha/docker-compose/node/docker-compose.yml index d207d5bc..a7c95e06 100644 --- a/openvidu-server/deployments/enterprise-ha/docker-compose/node/docker-compose.yml +++ b/openvidu-server/deployments/enterprise-ha/docker-compose/node/docker-compose.yml @@ -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 diff --git a/openvidu-server/deployments/enterprise/aws/CF-OpenVidu-Enterprise.yaml.template b/openvidu-server/deployments/enterprise/aws/CF-OpenVidu-Enterprise.yaml.template index 88d35fbd..374729db 100644 --- a/openvidu-server/deployments/enterprise/aws/CF-OpenVidu-Enterprise.yaml.template +++ b/openvidu-server/deployments/enterprise/aws/CF-OpenVidu-Enterprise.yaml.template @@ -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: diff --git a/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template b/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template index 6779f47f..552a1402 100644 --- a/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template +++ b/openvidu-server/deployments/enterprise/aws/cfn-crete-ov-aws-asg-ami.yaml.template @@ -254,7 +254,7 @@ Resources: BlockDeviceMappings: - DeviceName: /dev/sda1 Ebs: - VolumeType: gp2 + VolumeType: gp3 DeleteOnTermination: true VolumeSize: 10 UserData: diff --git a/openvidu-server/deployments/enterprise/aws/createAMI.sh b/openvidu-server/deployments/enterprise/aws/createAMI.sh index aa51a640..1e718f22 100755 --- a/openvidu-server/deployments/enterprise/aws/createAMI.sh +++ b/openvidu-server/deployments/enterprise/aws/createAMI.sh @@ -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' diff --git a/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template b/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template index a70969e4..2eddbffd 100644 --- a/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template +++ b/openvidu-server/deployments/enterprise/aws/dev/cfn-crete-ov-aws-asg-ami.yaml.template @@ -251,7 +251,7 @@ Resources: BlockDeviceMappings: - DeviceName: /dev/sda1 Ebs: - VolumeType: gp2 + VolumeType: gp3 DeleteOnTermination: true VolumeSize: 10 UserData: diff --git a/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh b/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh index c0e201b2..59675c8a 100755 --- a/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh +++ b/openvidu-server/deployments/enterprise/aws/dev/createAMI.sh @@ -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' diff --git a/openvidu-server/deployments/enterprise/aws/dev/deploy_cf.sh b/openvidu-server/deployments/enterprise/aws/dev/deploy_cf.sh index 47fe3abe..62362581 100755 --- a/openvidu-server/deployments/enterprise/aws/dev/deploy_cf.sh +++ b/openvidu-server/deployments/enterprise/aws/dev/deploy_cf.sh @@ -47,7 +47,7 @@ TEMP_JSON_ES_EBS_OPT=$(mktemp -t es-ebs-XXX --suffix .json) cat > "$TEMP_JSON_ES_EBS_OPT"< ${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') diff --git a/openvidu-server/deployments/external-turn/aws/CF-External-Turn.yml b/openvidu-server/deployments/external-turn/aws/CF-External-Turn.yml index 0898e947..5d920a9b 100644 --- a/openvidu-server/deployments/external-turn/aws/CF-External-Turn.yml +++ b/openvidu-server/deployments/external-turn/aws/CF-External-Turn.yml @@ -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 diff --git a/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template b/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template index a7302ced..ef226f28 100644 --- a/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template +++ b/openvidu-server/deployments/pro/aws/CF-OpenVidu-Pro.yaml.template @@ -768,7 +768,7 @@ Resources: BlockDeviceMappings: - DeviceName: /dev/sda1 Ebs: - VolumeType: gp2 + VolumeType: gp3 DeleteOnTermination: true VolumeSize: 200 diff --git a/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template b/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template index a502a76f..b97e234f 100644 --- a/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template @@ -175,7 +175,7 @@ Resources: BlockDeviceMappings: - DeviceName: /dev/sda1 Ebs: - VolumeType: gp2 + VolumeType: gp3 DeleteOnTermination: true VolumeSize: 10 Tags: diff --git a/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template b/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template index efe36636..65bb886b 100644 --- a/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template @@ -137,7 +137,7 @@ Resources: BlockDeviceMappings: - DeviceName: /dev/sda1 Ebs: - VolumeType: gp2 + VolumeType: gp3 DeleteOnTermination: true VolumeSize: 10 UserData: diff --git a/openvidu-server/deployments/pro/aws/createAMI.sh b/openvidu-server/deployments/pro/aws/createAMI.sh index 76986430..c2eaeccf 100755 --- a/openvidu-server/deployments/pro/aws/createAMI.sh +++ b/openvidu-server/deployments/pro/aws/createAMI.sh @@ -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' 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 e27b7bc3..f508f735 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 @@ -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 diff --git a/openvidu-server/deployments/pro/docker-compose/mono-node/.env b/openvidu-server/deployments/pro/docker-compose/mono-node/.env index 0ac62fc6..0f8195b1 100644 --- a/openvidu-server/deployments/pro/docker-compose/mono-node/.env +++ b/openvidu-server/deployments/pro/docker-compose/mono-node/.env @@ -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 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 97c64949..1a0f79ef 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 @@ -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 diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env index 24fe226d..bc5e0c8e 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env @@ -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 diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_launch_kms.sh b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_launch_kms.sh index d295b3e9..f0b029ca 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_launch_kms.sh +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_launch_kms.sh @@ -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') diff --git a/openvidu-server/docker/openvidu-deployment-tester/Dockerfile b/openvidu-server/docker/openvidu-deployment-tester/Dockerfile index b64fc2cd..a087b951 100644 --- a/openvidu-server/docker/openvidu-deployment-tester/Dockerfile +++ b/openvidu-server/docker/openvidu-deployment-tester/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND noninteractive \ DISPLAY :99.0 \ @@ -48,4 +48,4 @@ WORKDIR /workdir/src COPY ./entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/entrypoint.sh -ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] \ No newline at end of file +ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ] diff --git a/openvidu-server/docker/openvidu-dev/Dockerfile b/openvidu-server/docker/openvidu-dev/Dockerfile index 9f09ad96..78484a43 100644 --- a/openvidu-server/docker/openvidu-dev/Dockerfile +++ b/openvidu-server/docker/openvidu-dev/Dockerfile @@ -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 && \ diff --git a/openvidu-server/docker/openvidu-recording/Dockerfile b/openvidu-server/docker/openvidu-recording/Dockerfile index 36b3ab3e..a8b47b3b 100644 --- a/openvidu-server/docker/openvidu-recording/Dockerfile +++ b/openvidu-server/docker/openvidu-recording/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 LABEL maintainer="OpenVidu info@openvidu.io" # Install packages diff --git a/openvidu-server/docker/openvidu-recording/firefox/Dockerfile b/openvidu-server/docker/openvidu-recording/firefox/Dockerfile index 46b9c210..156b686b 100644 --- a/openvidu-server/docker/openvidu-recording/firefox/Dockerfile +++ b/openvidu-server/docker/openvidu-recording/firefox/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:24.04 MAINTAINER info@openvidu.io # Install packages diff --git a/openvidu-server/docker/openvidu-server-pro/Dockerfile b/openvidu-server/docker/openvidu-server-pro/Dockerfile index fec81d6a..176dfe8b 100644 --- a/openvidu-server/docker/openvidu-server-pro/Dockerfile +++ b/openvidu-server/docker/openvidu-server-pro/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 MAINTAINER info@openvidu.io ENV DEBIAN_FRONTEND=noninteractive diff --git a/openvidu-server/docker/openvidu-server/Dockerfile b/openvidu-server/docker/openvidu-server/Dockerfile index 855bf421..e3e7a523 100644 --- a/openvidu-server/docker/openvidu-server/Dockerfile +++ b/openvidu-server/docker/openvidu-server/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 MAINTAINER info@openvidu.io # Install Java, supervisor and netstat diff --git a/openvidu-test-e2e/docker/Dockerfile b/openvidu-test-e2e/docker/Dockerfile index 16f06c19..5247c04d 100644 --- a/openvidu-test-e2e/docker/Dockerfile +++ b/openvidu-test-e2e/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 LABEL maintainer="info@openvidu.io" diff --git a/openvidu-test-e2e/docker/create_image.sh b/openvidu-test-e2e/docker/create_image.sh index 27c5f05b..32c0f7af 100755 --- a/openvidu-test-e2e/docker/create_image.sh +++ b/openvidu-test-e2e/docker/create_image.sh @@ -1 +1 @@ -docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e:22.04 -f Dockerfile . \ No newline at end of file +docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e:24.04 -f Dockerfile . diff --git a/openvidu-test-e2e/docker/openvidu-test-e2e-android/Dockerfile b/openvidu-test-e2e/docker/openvidu-test-e2e-android/Dockerfile index e1d6b3d3..35a091b0 100644 --- a/openvidu-test-e2e/docker/openvidu-test-e2e-android/Dockerfile +++ b/openvidu-test-e2e/docker/openvidu-test-e2e-android/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 @@ -18,4 +18,4 @@ ENV ANDROID_HOME /usr/lib/android-sdk # Cleanup RUN rm -rf /var/lib/apt/lists/* -RUN apt-get autoremove --purge -y && apt-get autoclean \ No newline at end of file +RUN apt-get autoremove --purge -y && apt-get autoclean diff --git a/openvidu-test-e2e/docker/openvidu-test-e2e-android/create_image.sh b/openvidu-test-e2e/docker/openvidu-test-e2e-android/create_image.sh index a7881982..55b92808 100755 --- a/openvidu-test-e2e/docker/openvidu-test-e2e-android/create_image.sh +++ b/openvidu-test-e2e/docker/openvidu-test-e2e-android/create_image.sh @@ -1 +1 @@ -docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e-android:22.04 -f Dockerfile . \ No newline at end of file +docker build --rm --pull --no-cache -t openvidu/openvidu-test-e2e-android:24.04 -f Dockerfile . diff --git a/pom.xml b/pom.xml index 174c797f..c646a9fa 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 2.7.18 - 7.0.1-SNAPSHOT + 7.1.0 2.30.0 1.1.0 1.1.0 @@ -300,4 +300,4 @@ - \ No newline at end of file +