mirror of https://github.com/OpenVidu/openvidu.git
Compare commits
30 Commits
Author | SHA1 | Date |
---|---|---|
![]() |
448743ba8d | |
![]() |
1411f7d064 | |
![]() |
c05c1c599a | |
![]() |
b6738f80d6 | |
![]() |
0a883577f5 | |
![]() |
8dcaedfc28 | |
![]() |
a1c3652164 | |
![]() |
b177891341 | |
![]() |
22505d38c8 | |
![]() |
0f6e96380b | |
![]() |
7e8e031e8d | |
![]() |
c9d9919684 | |
![]() |
ace21eb8bb | |
![]() |
8037253ee0 | |
![]() |
9bafa811e7 | |
![]() |
3b60045a17 | |
![]() |
582a663ff0 | |
![]() |
b6deca81e1 | |
![]() |
40ed3b5dbe | |
![]() |
a805b3d8b3 | |
![]() |
f99cf2f834 | |
![]() |
023c1c188f | |
![]() |
7e45b027de | |
![]() |
33bcd91ef5 | |
![]() |
1faf9dbe8b | |
![]() |
c1149079c8 | |
![]() |
ef45123a74 | |
![]() |
1515f60258 | |
![]() |
7132277d47 | |
![]() |
babe7be554 |
|
@ -1,8 +1,8 @@
|
||||||
name: OpenVidu CE Tests
|
name: OpenVidu V2 CE Tests
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- v2
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- ".github/workflows/openvidu-components-angular-E2E.yml"
|
- ".github/workflows/openvidu-components-angular-E2E.yml"
|
||||||
- "openvidu-components-angular/**"
|
- "openvidu-components-angular/**"
|
||||||
|
@ -10,13 +10,13 @@ on:
|
||||||
- "openvidu-server/deployments/**"
|
- "openvidu-server/deployments/**"
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- v2
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
TEST_IMAGE:
|
TEST_IMAGE:
|
||||||
description: "Docker image where to run the tests"
|
description: "Docker image where to run the tests"
|
||||||
required: true
|
required: true
|
||||||
default: "openvidu/openvidu-test-e2e:22.04"
|
default: "openvidu/openvidu-test-e2e:24.04"
|
||||||
KURENTO_JAVA_COMMIT:
|
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'
|
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
|
required: true
|
||||||
|
@ -24,7 +24,7 @@ on:
|
||||||
KURENTO_MEDIA_SERVER_IMAGE:
|
KURENTO_MEDIA_SERVER_IMAGE:
|
||||||
description: "Docker image of kurento-media-server"
|
description: "Docker image of kurento-media-server"
|
||||||
required: true
|
required: true
|
||||||
default: "kurento/kurento-media-server:7.0.1"
|
default: "kurento/kurento-media-server:7.1.1"
|
||||||
DOCKER_RECORDING_VERSION:
|
DOCKER_RECORDING_VERSION:
|
||||||
description: "Force version of openvidu/openvidu-recording container"
|
description: "Force version of openvidu/openvidu-recording container"
|
||||||
required: true
|
required: true
|
||||||
|
@ -45,14 +45,14 @@ jobs:
|
||||||
main:
|
main:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: ${{ inputs.TEST_IMAGE || 'openvidu/openvidu-test-e2e:22.04' }}
|
image: ${{ inputs.TEST_IMAGE || 'openvidu/openvidu-test-e2e:24.04' }}
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
- /opt/openvidu:/opt/openvidu
|
- /opt/openvidu:/opt/openvidu
|
||||||
env:
|
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_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' }}
|
KURENTO_JAVA_COMMIT: ${{ inputs.KURENTO_JAVA_COMMIT || 'default' }}
|
||||||
DOCKER_RECORDING_VERSION: ${{ inputs.DOCKER_RECORDING_VERSION || 'default' }}
|
DOCKER_RECORDING_VERSION: ${{ inputs.DOCKER_RECORDING_VERSION || 'default' }}
|
||||||
CHROME_VERSION: ${{ inputs.CHROME_VERSION || 'latest' }}
|
CHROME_VERSION: ${{ inputs.CHROME_VERSION || 'latest' }}
|
||||||
|
@ -62,8 +62,8 @@ jobs:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup scripts
|
- name: Setup scripts
|
||||||
run: |
|
run: |
|
||||||
curl -sOJ --output-dir /opt https://raw.githubusercontent.com/OpenVidu/openvidu/master/ci-scripts/commons/build.sh
|
curl -sOJ --output-dir /opt https://raw.githubusercontent.com/OpenVidu/openvidu/v2/ci-scripts/commons/build.sh
|
||||||
curl -sOJ --output-dir /opt https://raw.githubusercontent.com/OpenVidu/openvidu/master/ci-scripts/commons/test-utils.sh
|
curl -sOJ --output-dir /opt https://raw.githubusercontent.com/OpenVidu/openvidu/v2/ci-scripts/commons/test-utils.sh
|
||||||
cp ci-scripts/openvidu-e2e-tests.sh /opt/openvidu-e2e-tests.sh
|
cp ci-scripts/openvidu-e2e-tests.sh /opt/openvidu-e2e-tests.sh
|
||||||
find /opt/*.sh -type f -print0 | xargs -0 chmod u+x
|
find /opt/*.sh -type f -print0 | xargs -0 chmod u+x
|
||||||
- name: Clean environment
|
- name: Clean environment
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
name: openvidu-components-angular E2E
|
name: openvidu-components-angular E2E
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
branches:
|
||||||
|
- v2
|
||||||
paths:
|
paths:
|
||||||
- 'openvidu-components-angular/**'
|
- 'openvidu-components-angular/**'
|
||||||
- 'openvidu-browser/**'
|
- 'openvidu-browser/**'
|
||||||
|
@ -8,7 +10,7 @@ on:
|
||||||
- '.github/workflows/openvidu-components-angular-E2E.yml'
|
- '.github/workflows/openvidu-components-angular-E2E.yml'
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- v2
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
commit_sha:
|
commit_sha:
|
||||||
|
|
|
@ -239,7 +239,7 @@ if [[ "${CHECK_AND_PREPARE_KURENTO_SNAPSHOT}" == true ]]; then
|
||||||
chmod -R 777 /etc/maven
|
chmod -R 777 /etc/maven
|
||||||
pushd /etc/maven
|
pushd /etc/maven
|
||||||
rm -f settings.xml
|
rm -f settings.xml
|
||||||
curl https://raw.githubusercontent.com/OpenVidu/openvidu/master/ci-scripts/kurento-snapshots.xml -o settings.xml
|
curl https://raw.githubusercontent.com/OpenVidu/openvidu/v2/ci-scripts/kurento-snapshots.xml -o settings.xml
|
||||||
sed -i "s|KURENTO_SNAPSHOTS_URL|${KURENTO_SNAPSHOTS_URL}|g" settings.xml
|
sed -i "s|KURENTO_SNAPSHOTS_URL|${KURENTO_SNAPSHOTS_URL}|g" settings.xml
|
||||||
popd
|
popd
|
||||||
else
|
else
|
||||||
|
|
|
@ -68,12 +68,12 @@ if [[ "${PREPARE_TEST_ENVIRONMENT}" == true ]]; then
|
||||||
FAKE_VIDEO1=/opt/openvidu/barcode.y4m
|
FAKE_VIDEO1=/opt/openvidu/barcode.y4m
|
||||||
FAKE_VIDEO2=/opt/openvidu/girl.mjpeg
|
FAKE_VIDEO2=/opt/openvidu/girl.mjpeg
|
||||||
if [ ! -f ${FAKE_VIDEO1} ]; then
|
if [ ! -f ${FAKE_VIDEO1} ]; then
|
||||||
sudo curl --location https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/barcode.y4m --create-dirs --output /opt/openvidu/barcode.y4m
|
sudo curl --location https://github.com/OpenVidu/openvidu/raw/v2/openvidu-test-e2e/docker/barcode.y4m --create-dirs --output /opt/openvidu/barcode.y4m
|
||||||
else
|
else
|
||||||
echo "File ${FAKE_VIDEO1} already exists"
|
echo "File ${FAKE_VIDEO1} already exists"
|
||||||
fi
|
fi
|
||||||
if [ ! -f ${FAKE_VIDEO2} ]; then
|
if [ ! -f ${FAKE_VIDEO2} ]; then
|
||||||
sudo curl --location https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/girl.mjpeg --create-dirs --output /opt/openvidu/girl.mjpeg
|
sudo curl --location https://github.com/OpenVidu/openvidu/raw/v2/openvidu-test-e2e/docker/girl.mjpeg --create-dirs --output /opt/openvidu/girl.mjpeg
|
||||||
else
|
else
|
||||||
echo "File ${FAKE_VIDEO2} already exists"
|
echo "File ${FAKE_VIDEO2} already exists"
|
||||||
fi
|
fi
|
||||||
|
@ -82,18 +82,18 @@ if [[ "${PREPARE_TEST_ENVIRONMENT}" == true ]]; then
|
||||||
FAKE_AUDIO1=/opt/openvidu/fakeaudio.wav
|
FAKE_AUDIO1=/opt/openvidu/fakeaudio.wav
|
||||||
FAKE_AUDIO2=/opt/openvidu/stt-test.wav
|
FAKE_AUDIO2=/opt/openvidu/stt-test.wav
|
||||||
if [ ! -f ${FAKE_AUDIO1} ]; then
|
if [ ! -f ${FAKE_AUDIO1} ]; then
|
||||||
sudo curl --location https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/fakeaudio.wav --create-dirs --output /opt/openvidu/fakeaudio.wav
|
sudo curl --location https://github.com/OpenVidu/openvidu/raw/v2/openvidu-test-e2e/docker/fakeaudio.wav --create-dirs --output /opt/openvidu/fakeaudio.wav
|
||||||
else
|
else
|
||||||
echo "File ${FAKE_AUDIO1} already exists"
|
echo "File ${FAKE_AUDIO1} already exists"
|
||||||
fi
|
fi
|
||||||
if [ ! -f ${FAKE_AUDIO2} ]; then
|
if [ ! -f ${FAKE_AUDIO2} ]; then
|
||||||
sudo curl --location https://github.com/OpenVidu/openvidu/raw/master/openvidu-test-e2e/docker/stt-test.wav --create-dirs --output /opt/openvidu/stt-test.wav
|
sudo curl --location https://github.com/OpenVidu/openvidu/raw/v2/openvidu-test-e2e/docker/stt-test.wav --create-dirs --output /opt/openvidu/stt-test.wav
|
||||||
else
|
else
|
||||||
echo "File ${FAKE_AUDIO2} already exists"
|
echo "File ${FAKE_AUDIO2} already exists"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Download recording custom layout
|
# Download recording custom layout
|
||||||
sudo curl --location https://raw.githubusercontent.com/OpenVidu/openvidu/master/openvidu-test-e2e/docker/my-custom-layout/index.html --create-dirs --output /opt/openvidu/test-layouts/layout1/index.html
|
sudo curl --location https://raw.githubusercontent.com/OpenVidu/openvidu/v2/openvidu-test-e2e/docker/my-custom-layout/index.html --create-dirs --output /opt/openvidu/test-layouts/layout1/index.html
|
||||||
|
|
||||||
# Open permissions for /opt/openvidu folder
|
# Open permissions for /opt/openvidu folder
|
||||||
sudo chmod -R 777 /opt/openvidu
|
sudo chmod -R 777 /opt/openvidu
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "openvidu-browser",
|
"name": "openvidu-browser",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "openvidu-browser",
|
"name": "openvidu-browser",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"events": "3.3.0",
|
"events": "3.3.0",
|
||||||
|
|
|
@ -44,5 +44,5 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"version": "2.30.0"
|
"version": "2.31.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "openvidu-components-testapp",
|
"name": "openvidu-components-testapp",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "openvidu-components-testapp",
|
"name": "openvidu-components-testapp",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "17.3.10",
|
"@angular/animations": "17.3.10",
|
||||||
"@angular/cdk": "17.3.10",
|
"@angular/cdk": "17.3.10",
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
"@angular/platform-browser-dynamic": "17.3.10",
|
"@angular/platform-browser-dynamic": "17.3.10",
|
||||||
"@angular/router": "17.3.10",
|
"@angular/router": "17.3.10",
|
||||||
"autolinker": "4.0.0",
|
"autolinker": "4.0.0",
|
||||||
"openvidu-browser": "2.30.0",
|
"openvidu-browser": "2.31.0",
|
||||||
"rxjs": "7.5.7",
|
"rxjs": "7.5.7",
|
||||||
"tslib": "2.3.1",
|
"tslib": "2.3.1",
|
||||||
"zone.js": "^0.14.6"
|
"zone.js": "^0.14.6"
|
||||||
|
@ -13328,9 +13328,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/openvidu-browser": {
|
"node_modules/openvidu-browser": {
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.30.0.tgz",
|
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.31.0.tgz",
|
||||||
"integrity": "sha512-OTtbo3gwdZp1i1I5DNHPRIPSoG7lJawXHXgYTUZ+IFrbXzvoBjJHilskJVLeAeTPcMwPLxJ96JLd+6sS946JWQ==",
|
"integrity": "sha512-68d3t+jI6SDcfQFzSB1lj9nEhcJc87+iqZTpR66s2j26/JlPNNzZ3yft1UCjhQFVogfqHIgvYiTCGkw+755LRQ==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"events": "3.3.0",
|
"events": "3.3.0",
|
||||||
"freeice": "2.2.2",
|
"freeice": "2.2.2",
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"@angular/platform-browser-dynamic": "17.3.10",
|
"@angular/platform-browser-dynamic": "17.3.10",
|
||||||
"@angular/router": "17.3.10",
|
"@angular/router": "17.3.10",
|
||||||
"autolinker": "4.0.0",
|
"autolinker": "4.0.0",
|
||||||
"openvidu-browser": "2.30.0",
|
"openvidu-browser": "2.31.0",
|
||||||
"rxjs": "7.5.7",
|
"rxjs": "7.5.7",
|
||||||
"tslib": "2.3.1",
|
"tslib": "2.3.1",
|
||||||
"zone.js": "^0.14.6"
|
"zone.js": "^0.14.6"
|
||||||
|
@ -78,5 +78,5 @@
|
||||||
"webcomponent:e2e-pro-ci": "cross-env LAUNCH_MODE=CI npm run webcomponent:e2e-pro",
|
"webcomponent:e2e-pro-ci": "cross-env LAUNCH_MODE=CI npm run webcomponent:e2e-pro",
|
||||||
"webcomponent:serve-testapp": "npx http-server ./e2e/webcomponent-app/ && echo http://localhost:8080/?OV_URL=https://localhost:4443&OV_SECRET=MY_SECRET&prejoin=false"
|
"webcomponent:serve-testapp": "npx http-server ./e2e/webcomponent-app/ && echo http://localhost:8080/?OV_URL=https://localhost:4443&OV_SECRET=MY_SECRET&prejoin=false"
|
||||||
},
|
},
|
||||||
"version": "2.30.0"
|
"version": "2.31.0"
|
||||||
}
|
}
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "openvidu-angular",
|
"name": "openvidu-angular",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "openvidu-angular",
|
"name": "openvidu-angular",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tslib": "^2.3.0"
|
"tslib": "^2.3.0"
|
||||||
},
|
},
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
"@angular/material": "^16.0.0 || ^17.0.0",
|
"@angular/material": "^16.0.0 || ^17.0.0",
|
||||||
"autolinker": "^4.0.0",
|
"autolinker": "^4.0.0",
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"openvidu-browser": "2.30.0"
|
"openvidu-browser": "2.31.0"
|
||||||
},
|
},
|
||||||
"version": "2.30.0"
|
"version": "2.31.0"
|
||||||
}
|
}
|
|
@ -10,7 +10,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>openvidu-java-client</artifactId>
|
<artifactId>openvidu-java-client</artifactId>
|
||||||
<version>2.30.0</version>
|
<version>2.31.0</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>OpenVidu Java Client</name>
|
<name>OpenVidu Java Client</name>
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.code.gson</groupId>
|
<groupId>com.google.code.gson</groupId>
|
||||||
<artifactId>gson</artifactId>
|
<artifactId>gson</artifactId>
|
||||||
<version>2.10</version>
|
<version>2.10.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
|
@ -81,23 +81,13 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.junit.jupiter</groupId>
|
<groupId>org.junit.jupiter</groupId>
|
||||||
<artifactId>junit-jupiter-api</artifactId>
|
<artifactId>junit-jupiter-api</artifactId>
|
||||||
<version>5.9.1</version>
|
<version>5.11.4</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-validator</groupId>
|
<groupId>commons-validator</groupId>
|
||||||
<artifactId>commons-validator</artifactId>
|
<artifactId>commons-validator</artifactId>
|
||||||
<version>1.7</version>
|
<version>1.9.0</version>
|
||||||
</dependency>
|
|
||||||
<!--
|
|
||||||
This dependency is used by commons-validator 1.7. But it should be
|
|
||||||
replaced or updated in the future:
|
|
||||||
https://issues.apache.org/jira/browse/VALIDATOR-485?jql=project%20%3D%20VALIDATOR%20AND%20fixVersion%20%3D%202.0
|
|
||||||
-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.commons</groupId>
|
|
||||||
<artifactId>commons-collections4</artifactId>
|
|
||||||
<version>4.4</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
{
|
{
|
||||||
"name": "openvidu-node-client",
|
"name": "openvidu-node-client",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "openvidu-node-client",
|
"name": "openvidu-node-client",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "1.7.1",
|
"axios": "1.7.9",
|
||||||
"buffer": "6.0.3"
|
"buffer": "6.0.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
@ -187,9 +187,9 @@
|
||||||
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
|
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
|
||||||
},
|
},
|
||||||
"node_modules/axios": {
|
"node_modules/axios": {
|
||||||
"version": "1.7.1",
|
"version": "1.7.9",
|
||||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz",
|
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
|
||||||
"integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==",
|
"integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"follow-redirects": "^1.15.6",
|
"follow-redirects": "^1.15.6",
|
||||||
"form-data": "^4.0.0",
|
"form-data": "^4.0.0",
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"author": "OpenVidu",
|
"author": "OpenVidu",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "1.7.1",
|
"axios": "1.7.9",
|
||||||
"buffer": "6.0.3"
|
"buffer": "6.0.3"
|
||||||
},
|
},
|
||||||
"description": "OpenVidu Node Client",
|
"description": "OpenVidu Node Client",
|
||||||
|
@ -24,5 +24,5 @@
|
||||||
"docs": "./generate-docs.sh"
|
"docs": "./generate-docs.sh"
|
||||||
},
|
},
|
||||||
"typings": "lib/index.d.ts",
|
"typings": "lib/index.d.ts",
|
||||||
"version": "2.30.0"
|
"version": "2.31.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -355,7 +355,7 @@ Resources:
|
||||||
BlockDeviceMappings:
|
BlockDeviceMappings:
|
||||||
- DeviceName: /dev/sda1
|
- DeviceName: /dev/sda1
|
||||||
Ebs:
|
Ebs:
|
||||||
VolumeType: gp2
|
VolumeType: gp3
|
||||||
DeleteOnTermination: true
|
DeleteOnTermination: true
|
||||||
VolumeSize: 200
|
VolumeSize: 200
|
||||||
|
|
||||||
|
|
|
@ -88,14 +88,14 @@ Resources:
|
||||||
IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
||||||
for IMG in $IMAGES
|
for IMG in $IMAGES
|
||||||
do
|
do
|
||||||
sed -i "s|$IMG.*|$IMG:master|g" docker-compose.yml
|
sed -i "s|$IMG.*|$IMG:master-v2|g" docker-compose.yml
|
||||||
done
|
done
|
||||||
|
|
||||||
# docker-compose.override.yml replace with master version
|
# docker-compose.override.yml replace with master version
|
||||||
IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
||||||
for IMG in $IMAGES
|
for IMG in $IMAGES
|
||||||
do
|
do
|
||||||
sed -i "s|$IMG.*|$IMG:master|g" docker-compose.override.yml
|
sed -i "s|$IMG.*|$IMG:master-v2|g" docker-compose.override.yml
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
@ -159,15 +159,22 @@ Resources:
|
||||||
- Key: Name
|
- Key: Name
|
||||||
Value: !Ref AWS::StackName
|
Value: !Ref AWS::StackName
|
||||||
KeyName: AWS_KEY_NAME
|
KeyName: AWS_KEY_NAME
|
||||||
|
BlockDeviceMappings:
|
||||||
|
- DeviceName: /dev/sda1
|
||||||
|
Ebs:
|
||||||
|
VolumeType: gp3
|
||||||
|
DeleteOnTermination: true
|
||||||
|
VolumeSize: 12
|
||||||
UserData:
|
UserData:
|
||||||
"Fn::Base64":
|
"Fn::Base64":
|
||||||
!Sub |
|
!Sub |
|
||||||
#!/bin/bash -x
|
#!/bin/bash -x
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
apt-get update && apt-get install -y \
|
apt-get update && apt-get install -y \
|
||||||
|
python3-setuptools \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
ec2-instance-connect
|
ec2-instance-connect
|
||||||
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
|
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
|
||||||
|
|
||||||
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerCE
|
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerCE
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
|
||||||
getUbuntuAmiId() {
|
getUbuntuAmiId() {
|
||||||
local AMI_ID=$(
|
local AMI_ID=$(
|
||||||
aws --region ${1} ec2 describe-images \
|
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" \
|
"Name=owner-alias,Values=amazon" \
|
||||||
--query "sort_by(Images, &CreationDate)" |
|
--query "sort_by(Images, &CreationDate)" |
|
||||||
jq -r '.[-1].ImageId'
|
jq -r '.[-1].ImageId'
|
||||||
|
@ -54,7 +54,7 @@ TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-ov-ce-am
|
||||||
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
||||||
# Avoid overriding existing versions
|
# Avoid overriding existing versions
|
||||||
# Only master and non existing versions can be overriden
|
# Only master and non existing versions can be overriden
|
||||||
if [[ ${OPENVIDU_VERSION} != "master" ]]; then
|
if [[ ${OPENVIDU_VERSION} != "master-v2" ]]; then
|
||||||
INSTALL_SCRIPT_EXISTS=true
|
INSTALL_SCRIPT_EXISTS=true
|
||||||
aws s3api head-object --bucket aws.openvidu.io --key install_openvidu_$OPENVIDU_VERSION.sh || INSTALL_SCRIPT_EXISTS=false
|
aws s3api head-object --bucket aws.openvidu.io --key install_openvidu_$OPENVIDU_VERSION.sh || INSTALL_SCRIPT_EXISTS=false
|
||||||
if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then
|
if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then
|
||||||
|
@ -112,7 +112,7 @@ sed -i "s/OPENVIDU_VERSION/${OPENVIDU_VERSION}/g" CF-OpenVidu-${OPENVIDU_VERSION
|
||||||
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
||||||
# Avoid overriding existing versions
|
# Avoid overriding existing versions
|
||||||
# Only master and non existing versions can be overriden
|
# Only master and non existing versions can be overriden
|
||||||
if [[ ${OPENVIDU_VERSION} != "master" ]]; then
|
if [[ ${OPENVIDU_VERSION} != "master-v2" ]]; then
|
||||||
CF_EXIST=true
|
CF_EXIST=true
|
||||||
aws s3api head-object --bucket aws.openvidu.io --key CF-OpenVidu-${OPENVIDU_VERSION}.yaml || CF_EXIST=false
|
aws s3api head-object --bucket aws.openvidu.io --key CF-OpenVidu-${OPENVIDU_VERSION}.yaml || CF_EXIST=false
|
||||||
if [[ ${CF_EXIST} == "true" ]]; then
|
if [[ ${CF_EXIST} == "true" ]]; then
|
||||||
|
|
|
@ -176,7 +176,7 @@ OPENVIDU_CDR_PATH=/opt/openvidu/cdr
|
||||||
# --------------------------
|
# --------------------------
|
||||||
# Docker hub kurento media server: https://hub.docker.com/r/kurento/kurento-media-server
|
# 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
|
# 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
|
# Kurento Media Server Level logs
|
||||||
# -------------------------------
|
# -------------------------------
|
||||||
|
|
|
@ -9,11 +9,11 @@ services:
|
||||||
#
|
#
|
||||||
# Default Application
|
# Default Application
|
||||||
#
|
#
|
||||||
# Openvidu-Call Version: 2.30.0
|
# Openvidu-Call Version: 2.31.0
|
||||||
#
|
#
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
app:
|
app:
|
||||||
image: openvidu/openvidu-call:2.30.0
|
image: openvidu/openvidu-call:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# This file will be overridden when update OpenVidu Platform
|
# This file will be overridden when update OpenVidu Platform
|
||||||
#
|
#
|
||||||
# Openvidu Version: 2.30.0
|
# Openvidu Version: 2.31.0
|
||||||
#
|
#
|
||||||
# Installation Mode: On Premises
|
# Installation Mode: On Premises
|
||||||
#
|
#
|
||||||
|
@ -22,7 +22,7 @@ version: '3.1'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
openvidu-server:
|
openvidu-server:
|
||||||
image: openvidu/openvidu-server:2.30.0
|
image: openvidu/openvidu-server:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
entrypoint: ['/usr/local/bin/entrypoint.sh']
|
entrypoint: ['/usr/local/bin/entrypoint.sh']
|
||||||
|
@ -45,7 +45,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
kms:
|
kms:
|
||||||
image: ${KMS_IMAGE:-kurento/kurento-media-server:7.0.1}
|
image: ${KMS_IMAGE:-kurento/kurento-media-server:7.1.1}
|
||||||
restart: always
|
restart: always
|
||||||
network_mode: host
|
network_mode: host
|
||||||
ulimits:
|
ulimits:
|
||||||
|
@ -65,7 +65,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
coturn:
|
coturn:
|
||||||
image: openvidu/openvidu-coturn:2.30.0
|
image: openvidu/openvidu-coturn:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
ports:
|
ports:
|
||||||
- "${COTURN_PORT:-3478}:${COTURN_PORT:-3478}/tcp"
|
- "${COTURN_PORT:-3478}:${COTURN_PORT:-3478}/tcp"
|
||||||
|
@ -89,7 +89,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
image: openvidu/openvidu-proxy:2.30.0
|
image: openvidu/openvidu-proxy:2.31.0
|
||||||
restart: always
|
restart: always
|
||||||
network_mode: host
|
network_mode: host
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.31.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
||||||
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
||||||
|
|
||||||
|
|
|
@ -9,11 +9,11 @@ services:
|
||||||
#
|
#
|
||||||
# Default Application
|
# Default Application
|
||||||
#
|
#
|
||||||
# Openvidu-Call Version: 2.30.0
|
# Openvidu-Call Version: 2.31.0
|
||||||
#
|
#
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
app:
|
app:
|
||||||
image: openvidu/openvidu-call:2.30.0
|
image: openvidu/openvidu-call:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
ports:
|
ports:
|
||||||
- 5442:5442
|
- 5442:5442
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#
|
#
|
||||||
# This file will be overridden when updating OpenVidu Enterprise HA
|
# This file will be overridden when updating OpenVidu Enterprise HA
|
||||||
#
|
#
|
||||||
# Openvidu Version: 2.30.0
|
# Openvidu Version: 2.31.0
|
||||||
#
|
#
|
||||||
# Installation Mode: On Premises
|
# Installation Mode: On Premises
|
||||||
#
|
#
|
||||||
|
@ -18,7 +18,7 @@ version: '3.1'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
loadbalancer:
|
loadbalancer:
|
||||||
image: openvidu/openvidu-proxy:2.30.0
|
image: openvidu/openvidu-proxy:2.31.0
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./certificates:/etc/letsencrypt
|
- ./certificates:/etc/letsencrypt
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=ov-enterprise-base-services
|
OPENVIDU_FOLDER=ov-enterprise-base-services
|
||||||
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.31.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
||||||
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#
|
#
|
||||||
# This file will be overridden when update OpenVidu Enterprise HA Node
|
# This file will be overridden when update OpenVidu Enterprise HA Node
|
||||||
#
|
#
|
||||||
# Openvidu Version: 2.30.0
|
# Openvidu Version: 2.31.0
|
||||||
#
|
#
|
||||||
# Installation Mode: On Premises
|
# Installation Mode: On Premises
|
||||||
#
|
#
|
||||||
|
@ -19,7 +19,7 @@ version: '3.1'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
openvidu-server:
|
openvidu-server:
|
||||||
image: openvidu/openvidu-server-pro:2.30.0
|
image: openvidu/openvidu-server-pro:2.31.0
|
||||||
container_name: openvidu-server
|
container_name: openvidu-server
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
|
@ -66,7 +66,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
replication-manager:
|
replication-manager:
|
||||||
image: openvidu/replication-manager-on-prem:2.30.0
|
image: openvidu/replication-manager-on-prem:2.31.0
|
||||||
container_name: replication-manager
|
container_name: replication-manager
|
||||||
restart: always
|
restart: always
|
||||||
network_mode: host
|
network_mode: host
|
||||||
|
@ -101,7 +101,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
coturn:
|
coturn:
|
||||||
image: openvidu/openvidu-coturn:2.30.0
|
image: openvidu/openvidu-coturn:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
@ -128,19 +128,19 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
media-node-controller:
|
media-node-controller:
|
||||||
image: openvidu/media-node-controller:2.30.0
|
image: openvidu/media-node-controller:2.31.0
|
||||||
restart: always
|
restart: always
|
||||||
ulimits:
|
ulimits:
|
||||||
core: -1
|
core: -1
|
||||||
environment:
|
environment:
|
||||||
- MEDIA_NODE_CONTROLLER_RECORDINGS_PATH=/opt/openvidu/mncontroller/recordings
|
- 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
|
- MEDIASOUP_IMAGE=openvidu/mediasoup-controller:2.31.0
|
||||||
- METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0
|
- METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0
|
||||||
- FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0
|
- FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0
|
||||||
- OPENVIDU_RECORDING_IMAGE=openvidu/openvidu-recording:2.30.0
|
- OPENVIDU_RECORDING_IMAGE=openvidu/openvidu-recording:2.31.0
|
||||||
- COTURN_IMAGE=openvidu/openvidu-coturn:2.30.0
|
- COTURN_IMAGE=openvidu/openvidu-coturn:2.31.0
|
||||||
- SPEECH_TO_TEXT_IMAGE=openvidu/speech-to-text-service:2.30.0
|
- SPEECH_TO_TEXT_IMAGE=openvidu/speech-to-text-service:2.31.0
|
||||||
- NO_COLOR=true
|
- NO_COLOR=true
|
||||||
ports:
|
ports:
|
||||||
- 3000:3000
|
- 3000:3000
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.31.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
||||||
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
||||||
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
||||||
|
|
|
@ -744,7 +744,7 @@ Resources:
|
||||||
BlockDeviceMappings:
|
BlockDeviceMappings:
|
||||||
- DeviceName: /dev/sda1
|
- DeviceName: /dev/sda1
|
||||||
Ebs:
|
Ebs:
|
||||||
VolumeType: gp2
|
VolumeType: gp3
|
||||||
DeleteOnTermination: true
|
DeleteOnTermination: true
|
||||||
VolumeSize: 50
|
VolumeSize: 50
|
||||||
|
|
||||||
|
@ -1005,7 +1005,7 @@ Resources:
|
||||||
BlockDeviceMappings:
|
BlockDeviceMappings:
|
||||||
- DeviceName: /dev/sda1
|
- DeviceName: /dev/sda1
|
||||||
Ebs:
|
Ebs:
|
||||||
VolumeType: gp2
|
VolumeType: gp3
|
||||||
DeleteOnTermination: true
|
DeleteOnTermination: true
|
||||||
VolumeSize: 100
|
VolumeSize: 100
|
||||||
UserData:
|
UserData:
|
||||||
|
|
|
@ -89,7 +89,7 @@ Resources:
|
||||||
IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
||||||
for IMG in $IMAGES
|
for IMG in $IMAGES
|
||||||
do
|
do
|
||||||
sed -i "s|image: $IMG:.*|image: $IMG:master|g" docker-compose.yml
|
sed -i "s|image: $IMG:.*|image: $IMG:master-v2|g" docker-compose.yml
|
||||||
done
|
done
|
||||||
|
|
||||||
# docker-compose.override.yml replace with master version
|
# docker-compose.override.yml replace with master version
|
||||||
|
@ -97,7 +97,7 @@ Resources:
|
||||||
IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
||||||
for IMG in $IMAGES
|
for IMG in $IMAGES
|
||||||
do
|
do
|
||||||
sed -i "s|image: $IMG:.*|image: $IMG:master|g" docker-compose.override.yml
|
sed -i "s|image: $IMG:.*|image: $IMG:master-v2|g" docker-compose.override.yml
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -254,18 +254,19 @@ Resources:
|
||||||
BlockDeviceMappings:
|
BlockDeviceMappings:
|
||||||
- DeviceName: /dev/sda1
|
- DeviceName: /dev/sda1
|
||||||
Ebs:
|
Ebs:
|
||||||
VolumeType: gp2
|
VolumeType: gp3
|
||||||
DeleteOnTermination: true
|
DeleteOnTermination: true
|
||||||
VolumeSize: 10
|
VolumeSize: 12
|
||||||
UserData:
|
UserData:
|
||||||
"Fn::Base64":
|
"Fn::Base64":
|
||||||
!Sub |
|
!Sub |
|
||||||
#!/bin/bash -x
|
#!/bin/bash -x
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
apt-get update && apt-get install -y \
|
apt-get update && apt-get install -y \
|
||||||
|
python3-setuptools \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
ec2-instance-connect
|
ec2-instance-connect
|
||||||
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
|
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
|
||||||
|
|
||||||
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerPro
|
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerPro
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
|
||||||
getUbuntuAmiId() {
|
getUbuntuAmiId() {
|
||||||
local AMI_ID=$(
|
local AMI_ID=$(
|
||||||
aws --region ${1} ec2 describe-images \
|
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" \
|
"Name=owner-alias,Values=amazon" \
|
||||||
--query "sort_by(Images, &CreationDate)" |
|
--query "sort_by(Images, &CreationDate)" |
|
||||||
jq -r '.[-1].ImageId'
|
jq -r '.[-1].ImageId'
|
||||||
|
@ -56,7 +56,7 @@ TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-crete-ov-aws
|
||||||
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
||||||
# Avoid overriding existing versions
|
# Avoid overriding existing versions
|
||||||
# Only master and non existing versions can be overriden
|
# Only master and non existing versions can be overriden
|
||||||
if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then
|
if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then
|
||||||
INSTALL_SCRIPT_EXISTS=true
|
INSTALL_SCRIPT_EXISTS=true
|
||||||
aws s3api head-object --bucket aws.openvidu.io --key install_openvidu_enterprise_master_node_$OPENVIDU_PRO_VERSION.sh || INSTALL_SCRIPT_EXISTS=false
|
aws s3api head-object --bucket aws.openvidu.io --key install_openvidu_enterprise_master_node_$OPENVIDU_PRO_VERSION.sh || INSTALL_SCRIPT_EXISTS=false
|
||||||
if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then
|
if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then
|
||||||
|
@ -121,7 +121,7 @@ sed -i "s/KMS_AMI_ID/${KMS_AMI_ID}/g" CF-OpenVidu-Enterprise-${OPENVIDU_PRO_VERS
|
||||||
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
||||||
# Avoid overriding existing versions
|
# Avoid overriding existing versions
|
||||||
# Only master and non existing versions can be overriden
|
# Only master and non existing versions can be overriden
|
||||||
if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then
|
if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then
|
||||||
CF_EXIST=true
|
CF_EXIST=true
|
||||||
aws s3api head-object --bucket aws.openvidu.io --key CF-OpenVidu-Enterprise-${OPENVIDU_PRO_VERSION}.yaml || CF_EXIST=false
|
aws s3api head-object --bucket aws.openvidu.io --key CF-OpenVidu-Enterprise-${OPENVIDU_PRO_VERSION}.yaml || CF_EXIST=false
|
||||||
if [[ ${CF_EXIST} == "true" ]]; then
|
if [[ ${CF_EXIST} == "true" ]]; then
|
||||||
|
|
|
@ -80,8 +80,8 @@ Resources:
|
||||||
|
|
||||||
# Install openvidu-pro
|
# Install openvidu-pro
|
||||||
cd /opt
|
cd /opt
|
||||||
if [[ "OPENVIDU_VERSION" == "master" ]]; then
|
if [[ "OPENVIDU_VERSION" == "master-v2" ]]; then
|
||||||
curl https://raw.githubusercontent.com/OpenVidu/openvidu/master/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh | bash
|
curl https://raw.githubusercontent.com/OpenVidu/openvidu/v2/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh | bash
|
||||||
else
|
else
|
||||||
curl https://raw.githubusercontent.com/OpenVidu/openvidu/vOPENVIDU_VERSION/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh | bash
|
curl https://raw.githubusercontent.com/OpenVidu/openvidu/vOPENVIDU_VERSION/openvidu-server/deployments/enterprise/docker-compose/install_openvidu_enterprise_master_node.sh | bash
|
||||||
fi
|
fi
|
||||||
|
@ -93,7 +93,7 @@ Resources:
|
||||||
IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
||||||
for IMG in $IMAGES
|
for IMG in $IMAGES
|
||||||
do
|
do
|
||||||
sed -i "s|image: $IMG:.*|image: $IMG:master|g" docker-compose.yml
|
sed -i "s|image: $IMG:.*|image: $IMG:master-v2|g" docker-compose.yml
|
||||||
done
|
done
|
||||||
|
|
||||||
# docker-compose.override.yml replace with master version
|
# docker-compose.override.yml replace with master version
|
||||||
|
@ -101,7 +101,7 @@ Resources:
|
||||||
IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
||||||
for IMG in $IMAGES
|
for IMG in $IMAGES
|
||||||
do
|
do
|
||||||
sed -i "s|image: $IMG:.*|image: $IMG:master|g" docker-compose.override.yml
|
sed -i "s|image: $IMG:.*|image: $IMG:master-v2|g" docker-compose.override.yml
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -251,18 +251,19 @@ Resources:
|
||||||
BlockDeviceMappings:
|
BlockDeviceMappings:
|
||||||
- DeviceName: /dev/sda1
|
- DeviceName: /dev/sda1
|
||||||
Ebs:
|
Ebs:
|
||||||
VolumeType: gp2
|
VolumeType: gp3
|
||||||
DeleteOnTermination: true
|
DeleteOnTermination: true
|
||||||
VolumeSize: 10
|
VolumeSize: 12
|
||||||
UserData:
|
UserData:
|
||||||
"Fn::Base64":
|
"Fn::Base64":
|
||||||
!Sub |
|
!Sub |
|
||||||
#!/bin/bash -x
|
#!/bin/bash -x
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
apt-get update && apt-get install -y \
|
apt-get update && apt-get install -y \
|
||||||
|
python3-setuptools \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
ec2-instance-connect
|
ec2-instance-connect
|
||||||
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
|
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
|
||||||
|
|
||||||
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerPro
|
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerPro
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
|
||||||
getUbuntuAmiId() {
|
getUbuntuAmiId() {
|
||||||
local AMI_ID=$(
|
local AMI_ID=$(
|
||||||
aws --region ${1} ec2 describe-images \
|
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" \
|
"Name=owner-alias,Values=amazon" \
|
||||||
--query "sort_by(Images, &CreationDate)" |
|
--query "sort_by(Images, &CreationDate)" |
|
||||||
jq -r '.[-1].ImageId'
|
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
|
cat > "$TEMP_JSON_ES_EBS_OPT"<<EOF
|
||||||
{
|
{
|
||||||
"EBSEnabled": true,
|
"EBSEnabled": true,
|
||||||
"VolumeType": "gp2",
|
"VolumeType": "gp3",
|
||||||
"VolumeSize": 10
|
"VolumeSize": 10
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
|
@ -379,7 +379,7 @@ ELASTICSEARCH_PASSWORD=
|
||||||
# Uncomment the next line and define this variable with KMS image that you want use
|
# 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
|
# 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
|
# 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
|
# Uncomment the next line and define this variable to change
|
||||||
# the verbosity level of the logs of KMS
|
# 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} \
|
--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}'}]" \
|
--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}" \
|
--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}
|
--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')
|
docker run --rm amazon/aws-cli:${AWS_CLI_DOCKER_TAG} ec2 wait instance-running --instance-ids $(cat ${OUTPUT} | jq --raw-output ' .Instances[] | .InstanceId')
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# This file will be overridden when update OpenVidu Platform
|
# This file will be overridden when update OpenVidu Platform
|
||||||
#
|
#
|
||||||
# Openvidu Version: 2.30.0
|
# Openvidu Version: 2.31.0
|
||||||
#
|
#
|
||||||
# Installation Mode: On Premises
|
# Installation Mode: On Premises
|
||||||
#
|
#
|
||||||
|
@ -22,7 +22,7 @@ version: '3.1'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
openvidu-server:
|
openvidu-server:
|
||||||
image: openvidu/openvidu-server-pro:2.30.0
|
image: openvidu/openvidu-server-pro:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
entrypoint: ['/usr/local/bin/entrypoint.sh']
|
entrypoint: ['/usr/local/bin/entrypoint.sh']
|
||||||
|
@ -60,7 +60,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
replication-manager:
|
replication-manager:
|
||||||
image: openvidu/replication-manager:2.30.0
|
image: openvidu/replication-manager:2.31.0
|
||||||
restart: always
|
restart: always
|
||||||
network_mode: host
|
network_mode: host
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -89,7 +89,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
coturn:
|
coturn:
|
||||||
image: openvidu/openvidu-coturn:2.30.0
|
image: openvidu/openvidu-coturn:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
env_file:
|
env_file:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.31.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
||||||
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
||||||
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
||||||
|
|
|
@ -174,7 +174,7 @@ Resources:
|
||||||
Type: Custom::FindAMI
|
Type: Custom::FindAMI
|
||||||
Properties:
|
Properties:
|
||||||
ServiceToken: !Sub ${GetLatestUbuntuAmi.Arn}
|
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:
|
TurnServerInstance:
|
||||||
Type: 'AWS::EC2::Instance'
|
Type: 'AWS::EC2::Instance'
|
||||||
|
@ -286,9 +286,10 @@ Resources:
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
|
|
||||||
apt-get update && apt-get install -y \
|
apt-get update && apt-get install -y \
|
||||||
|
python3-setuptools \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
ec2-instance-connect
|
ec2-instance-connect
|
||||||
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
|
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
|
||||||
|
|
||||||
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource TurnServerInstance
|
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource TurnServerInstance
|
||||||
|
|
||||||
|
@ -314,7 +315,7 @@ Resources:
|
||||||
BlockDeviceMappings:
|
BlockDeviceMappings:
|
||||||
- DeviceName: /dev/sda1
|
- DeviceName: /dev/sda1
|
||||||
Ebs:
|
Ebs:
|
||||||
VolumeType: gp2
|
VolumeType: gp3
|
||||||
DeleteOnTermination: true
|
DeleteOnTermination: true
|
||||||
VolumeSize: 25
|
VolumeSize: 25
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
COTURN_FOLDER="coturn"
|
COTURN_FOLDER="coturn"
|
||||||
CERTBOT_WRAPPER="${COTURN_FOLDER}/certbot-wrapper"
|
CERTBOT_WRAPPER="${COTURN_FOLDER}/certbot-wrapper"
|
||||||
COTURN_VERSION=master
|
COTURN_VERSION=v2
|
||||||
DOWNLOAD_URL="https://raw.githubusercontent.com/OpenVidu/openvidu/master/openvidu-server/deployments/external-turn/${COTURN_VERSION}"
|
DOWNLOAD_URL="https://raw.githubusercontent.com/OpenVidu/openvidu/v2/openvidu-server/deployments/external-turn/${COTURN_VERSION}"
|
||||||
#COTURN_VERSION=4.6.2
|
#COTURN_VERSION=4.6.2
|
||||||
#DOWNLOAD_URL="https://s3.eu-west-1.amazonaws.com/aws.openvidu.io/external-turn/${COTURN_VERSION}"
|
#DOWNLOAD_URL="https://s3.eu-west-1.amazonaws.com/aws.openvidu.io/external-turn/${COTURN_VERSION}"
|
||||||
|
|
||||||
|
|
|
@ -768,7 +768,7 @@ Resources:
|
||||||
BlockDeviceMappings:
|
BlockDeviceMappings:
|
||||||
- DeviceName: /dev/sda1
|
- DeviceName: /dev/sda1
|
||||||
Ebs:
|
Ebs:
|
||||||
VolumeType: gp2
|
VolumeType: gp3
|
||||||
DeleteOnTermination: true
|
DeleteOnTermination: true
|
||||||
VolumeSize: 200
|
VolumeSize: 200
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,7 @@ Resources:
|
||||||
for IMAGE in "${IMAGES[@]}"
|
for IMAGE in "${IMAGES[@]}"
|
||||||
do
|
do
|
||||||
# Replace the image tag in the YAML file
|
# Replace the image tag in the YAML file
|
||||||
sed -i "s,$IMAGE:.*,${IMAGE}:master,g" docker-compose.yml
|
sed -i "s,$IMAGE:.*,${IMAGE}:master-v2,g" docker-compose.yml
|
||||||
done
|
done
|
||||||
|
|
||||||
# Docker pull of the images
|
# Docker pull of the images
|
||||||
|
@ -175,9 +175,9 @@ Resources:
|
||||||
BlockDeviceMappings:
|
BlockDeviceMappings:
|
||||||
- DeviceName: /dev/sda1
|
- DeviceName: /dev/sda1
|
||||||
Ebs:
|
Ebs:
|
||||||
VolumeType: gp2
|
VolumeType: gp3
|
||||||
DeleteOnTermination: true
|
DeleteOnTermination: true
|
||||||
VolumeSize: 10
|
VolumeSize: 12
|
||||||
Tags:
|
Tags:
|
||||||
- Key: Name
|
- Key: Name
|
||||||
Value: !Ref AWS::StackName
|
Value: !Ref AWS::StackName
|
||||||
|
@ -187,9 +187,10 @@ Resources:
|
||||||
#!/bin/bash -x
|
#!/bin/bash -x
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
apt-get update && apt-get install -y \
|
apt-get update && apt-get install -y \
|
||||||
|
python3-setuptools \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
ec2-instance-connect
|
ec2-instance-connect
|
||||||
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
|
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
|
||||||
|
|
||||||
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource KurentoMediaServer
|
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource KurentoMediaServer
|
||||||
|
|
||||||
|
|
|
@ -90,14 +90,14 @@ Resources:
|
||||||
IMAGES=$(echo "$IMAGES" | grep -v openvidu/openvidu-elasticsearch)
|
IMAGES=$(echo "$IMAGES" | grep -v openvidu/openvidu-elasticsearch)
|
||||||
for IMG in $IMAGES
|
for IMG in $IMAGES
|
||||||
do
|
do
|
||||||
sed -i "s|$IMG.*|$IMG:master|g" docker-compose.yml
|
sed -i "s|$IMG.*|$IMG:master-v2|g" docker-compose.yml
|
||||||
done
|
done
|
||||||
|
|
||||||
# docker-compose.override.yml replace with master version
|
# docker-compose.override.yml replace with master version
|
||||||
IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
|
||||||
for IMG in $IMAGES
|
for IMG in $IMAGES
|
||||||
do
|
do
|
||||||
sed -i "s|$IMG.*|$IMG:master|g" docker-compose.override.yml
|
sed -i "s|$IMG.*|$IMG:master-v2|g" docker-compose.override.yml
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
@ -137,18 +137,19 @@ Resources:
|
||||||
BlockDeviceMappings:
|
BlockDeviceMappings:
|
||||||
- DeviceName: /dev/sda1
|
- DeviceName: /dev/sda1
|
||||||
Ebs:
|
Ebs:
|
||||||
VolumeType: gp2
|
VolumeType: gp3
|
||||||
DeleteOnTermination: true
|
DeleteOnTermination: true
|
||||||
VolumeSize: 10
|
VolumeSize: 12
|
||||||
UserData:
|
UserData:
|
||||||
"Fn::Base64":
|
"Fn::Base64":
|
||||||
!Sub |
|
!Sub |
|
||||||
#!/bin/bash -x
|
#!/bin/bash -x
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
apt-get update && apt-get install -y \
|
apt-get update && apt-get install -y \
|
||||||
|
python3-setuptools \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
ec2-instance-connect
|
ec2-instance-connect
|
||||||
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
|
pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz --break-system-packages
|
||||||
|
|
||||||
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerPro
|
cfn-init --region ${AWS::Region} --stack ${AWS::StackId} --resource OpenviduServerPro
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ TEMPJSON=$(mktemp -t cloudformation-XXX --suffix .json)
|
||||||
getUbuntuAmiId() {
|
getUbuntuAmiId() {
|
||||||
local AMI_ID=$(
|
local AMI_ID=$(
|
||||||
aws --region ${1} ec2 describe-images \
|
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" \
|
"Name=owner-alias,Values=amazon" \
|
||||||
--query "sort_by(Images, &CreationDate)" |
|
--query "sort_by(Images, &CreationDate)" |
|
||||||
jq -r '.[-1].ImageId'
|
jq -r '.[-1].ImageId'
|
||||||
|
@ -72,7 +72,7 @@ TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-kms-ami.
|
||||||
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
||||||
# Avoid overriding existing versions
|
# Avoid overriding existing versions
|
||||||
# Only master and non existing versions can be overriden
|
# Only master and non existing versions can be overriden
|
||||||
if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then
|
if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then
|
||||||
INSTALL_SCRIPT_EXISTS=true
|
INSTALL_SCRIPT_EXISTS=true
|
||||||
aws s3api head-object --bucket aws.openvidu.io --key install_media_node_$OPENVIDU_PRO_VERSION.sh || INSTALL_SCRIPT_EXISTS=false
|
aws s3api head-object --bucket aws.openvidu.io --key install_media_node_$OPENVIDU_PRO_VERSION.sh || INSTALL_SCRIPT_EXISTS=false
|
||||||
if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then
|
if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then
|
||||||
|
@ -132,7 +132,7 @@ TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-ov-ami.y
|
||||||
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
||||||
# Avoid overriding existing versions
|
# Avoid overriding existing versions
|
||||||
# Only master and non existing versions can be overriden
|
# Only master and non existing versions can be overriden
|
||||||
if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then
|
if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then
|
||||||
INSTALL_SCRIPT_EXISTS=true
|
INSTALL_SCRIPT_EXISTS=true
|
||||||
aws s3api head-object --bucket aws.openvidu.io --key install_openvidu_pro_$OPENVIDU_PRO_VERSION.sh || INSTALL_SCRIPT_EXISTS=false
|
aws s3api head-object --bucket aws.openvidu.io --key install_openvidu_pro_$OPENVIDU_PRO_VERSION.sh || INSTALL_SCRIPT_EXISTS=false
|
||||||
if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then
|
if [[ ${INSTALL_SCRIPT_EXISTS} == "true" ]]; then
|
||||||
|
@ -191,7 +191,7 @@ sed -i "s/_AWS_CLI_DOCKER_TAG_/${AWS_CLI_DOCKER_TAG}/g" CF-OpenVidu-Pro-${OPENVI
|
||||||
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
if [[ ${UPDATE_S3_FILES} == "true" ]]; then
|
||||||
# Avoid overriding existing versions
|
# Avoid overriding existing versions
|
||||||
# Only master and non existing versions can be overriden
|
# Only master and non existing versions can be overriden
|
||||||
if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then
|
if [[ ${OPENVIDU_PRO_VERSION} != "master-v2" ]]; then
|
||||||
CF_EXIST=true
|
CF_EXIST=true
|
||||||
aws s3api head-object --bucket aws.openvidu.io --key CF-OpenVidu-Pro-${OPENVIDU_PRO_VERSION}.yaml || CF_EXIST=false
|
aws s3api head-object --bucket aws.openvidu.io --key CF-OpenVidu-Pro-${OPENVIDU_PRO_VERSION}.yaml || CF_EXIST=false
|
||||||
if [[ ${CF_EXIST} == "true" ]]; then
|
if [[ ${CF_EXIST} == "true" ]]; then
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#
|
#
|
||||||
# This docker-compose file coordinates all services of OpenVidu CE Platform.
|
# This docker-compose file coordinates all services of OpenVidu CE Platform.
|
||||||
#
|
#
|
||||||
# Openvidu Version: 2.30.0
|
# Openvidu Version: 2.31.0
|
||||||
#
|
#
|
||||||
# Installation Mode: On Premises
|
# Installation Mode: On Premises
|
||||||
#
|
#
|
||||||
|
@ -16,19 +16,19 @@ version: '3.1'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
media-node-controller:
|
media-node-controller:
|
||||||
image: openvidu/media-node-controller:2.30.0
|
image: openvidu/media-node-controller:2.31.0
|
||||||
restart: always
|
restart: always
|
||||||
ulimits:
|
ulimits:
|
||||||
core: -1
|
core: -1
|
||||||
entrypoint: ['/bin/sh', '-c', '/beats/copy_config_files.sh && /usr/local/bin/entrypoint.sh']
|
entrypoint: ['/bin/sh', '-c', '/beats/copy_config_files.sh && /usr/local/bin/entrypoint.sh']
|
||||||
environment:
|
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
|
- MEDIASOUP_IMAGE=openvidu/mediasoup-controller:2.31.0
|
||||||
- METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0
|
- METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0
|
||||||
- FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0
|
- FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0
|
||||||
- OPENVIDU_RECORDING_IMAGE=openvidu/openvidu-recording:2.30.0
|
- OPENVIDU_RECORDING_IMAGE=openvidu/openvidu-recording:2.31.0
|
||||||
- COTURN_IMAGE=openvidu/openvidu-coturn:2.30.0
|
- COTURN_IMAGE=openvidu/openvidu-coturn:2.31.0
|
||||||
- SPEECH_TO_TEXT_IMAGE=openvidu/speech-to-text-service:2.30.0
|
- SPEECH_TO_TEXT_IMAGE=openvidu/speech-to-text-service:2.31.0
|
||||||
- NO_COLOR=true
|
- NO_COLOR=true
|
||||||
ports:
|
ports:
|
||||||
- 3000:3000
|
- 3000:3000
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
MEDIA_NODE_FOLDER=kms
|
MEDIA_NODE_FOLDER=kms
|
||||||
MEDIA_NODE_VERSION=master
|
MEDIA_NODE_VERSION=v2.31.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
||||||
BEATS_FOLDER=${MEDIA_NODE_FOLDER}/beats
|
BEATS_FOLDER=${MEDIA_NODE_FOLDER}/beats
|
||||||
OPENVIDU_RECORDINGS_FOLDER="/opt/openvidu/recordings"
|
OPENVIDU_RECORDINGS_FOLDER="/opt/openvidu/recordings"
|
||||||
|
|
|
@ -332,7 +332,7 @@ ELASTICSEARCH_PASSWORD=
|
||||||
# Uncomment the next line and define this variable with KMS image that you want use
|
# 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
|
# 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
|
# 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
|
# Uncomment the next line and define this variable to change
|
||||||
# the verbosity level of the logs of KMS
|
# the verbosity level of the logs of KMS
|
||||||
|
|
|
@ -9,11 +9,11 @@ services:
|
||||||
#
|
#
|
||||||
# Default Application
|
# Default Application
|
||||||
#
|
#
|
||||||
# Openvidu-Call Version: 2.30.0
|
# Openvidu-Call Version: 2.31.0
|
||||||
#
|
#
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
app:
|
app:
|
||||||
image: openvidu/openvidu-call:2.30.0
|
image: openvidu/openvidu-call:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# This file will be overridden when update OpenVidu Platform
|
# This file will be overridden when update OpenVidu Platform
|
||||||
#
|
#
|
||||||
# Openvidu Version: 2.30.0
|
# Openvidu Version: 2.31.0
|
||||||
#
|
#
|
||||||
# Installation Mode: OpenVidu PRO On Premises - Mono Node
|
# Installation Mode: OpenVidu PRO On Premises - Mono Node
|
||||||
#
|
#
|
||||||
|
@ -22,7 +22,7 @@ version: '3.1'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
openvidu-server:
|
openvidu-server:
|
||||||
image: openvidu/openvidu-server-pro:2.30.0
|
image: openvidu/openvidu-server-pro:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
entrypoint: ['/usr/local/bin/entrypoint.sh']
|
entrypoint: ['/usr/local/bin/entrypoint.sh']
|
||||||
|
@ -58,7 +58,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
coturn:
|
coturn:
|
||||||
image: openvidu/openvidu-coturn:2.30.0
|
image: openvidu/openvidu-coturn:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
@ -85,7 +85,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
image: openvidu/openvidu-proxy:2.30.0
|
image: openvidu/openvidu-proxy:2.31.0
|
||||||
restart: always
|
restart: always
|
||||||
network_mode: host
|
network_mode: host
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -151,19 +151,19 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
media-node-controller:
|
media-node-controller:
|
||||||
image: openvidu/media-node-controller:2.30.0
|
image: openvidu/media-node-controller:2.31.0
|
||||||
restart: always
|
restart: always
|
||||||
ulimits:
|
ulimits:
|
||||||
core: -1
|
core: -1
|
||||||
environment:
|
environment:
|
||||||
- MEDIA_NODE_CONTROLLER_RECORDINGS_PATH=/opt/openvidu/mncontroller/recordings
|
- 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
|
- MEDIASOUP_IMAGE=openvidu/mediasoup-controller:2.31.0
|
||||||
- METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0
|
- METRICBEAT_IMAGE=docker.elastic.co/beats/metricbeat-oss:7.8.0
|
||||||
- FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0
|
- FILEBEAT_IMAGE=docker.elastic.co/beats/filebeat-oss:7.8.0
|
||||||
- OPENVIDU_RECORDING_IMAGE=openvidu/openvidu-recording:2.30.0
|
- OPENVIDU_RECORDING_IMAGE=openvidu/openvidu-recording:2.31.0
|
||||||
- SPEECH_TO_TEXT_IMAGE=openvidu/speech-to-text-service:2.30.0
|
- SPEECH_TO_TEXT_IMAGE=openvidu/speech-to-text-service:2.31.0
|
||||||
- COTURN_IMAGE=openvidu/openvidu-coturn:2.30.0
|
- COTURN_IMAGE=openvidu/openvidu-coturn:2.31.0
|
||||||
- NO_COLOR=true
|
- NO_COLOR=true
|
||||||
ports:
|
ports:
|
||||||
- 3000:3000
|
- 3000:3000
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.31.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
||||||
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
||||||
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
||||||
|
|
|
@ -375,7 +375,7 @@ ELASTICSEARCH_PASSWORD=
|
||||||
# Uncomment the next line and define this variable with KMS image that you want use
|
# 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
|
# 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
|
# 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
|
# Uncomment the next line and define this variable to change
|
||||||
# the verbosity level of the logs of KMS
|
# 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}" \
|
--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}'}]" \
|
--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}" \
|
--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}"
|
--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')
|
docker run --rm amazon/aws-cli:"${AWS_CLI_DOCKER_TAG}" ec2 wait instance-running --instance-ids $(cat ${OUTPUT} | jq --raw-output ' .Instances[] | .InstanceId')
|
||||||
|
|
|
@ -9,11 +9,11 @@ services:
|
||||||
#
|
#
|
||||||
# Default Application
|
# Default Application
|
||||||
#
|
#
|
||||||
# Openvidu-Call Version: 2.30.0
|
# Openvidu-Call Version: 2.31.0
|
||||||
#
|
#
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
app:
|
app:
|
||||||
image: openvidu/openvidu-call:2.30.0
|
image: openvidu/openvidu-call:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# This file will be overridden when update OpenVidu Platform
|
# This file will be overridden when update OpenVidu Platform
|
||||||
#
|
#
|
||||||
# Openvidu Version: 2.30.0
|
# Openvidu Version: 2.31.0
|
||||||
#
|
#
|
||||||
# Installation Mode: On Premises
|
# Installation Mode: On Premises
|
||||||
#
|
#
|
||||||
|
@ -22,7 +22,7 @@ version: '3.1'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
openvidu-server:
|
openvidu-server:
|
||||||
image: openvidu/openvidu-server-pro:2.30.0
|
image: openvidu/openvidu-server-pro:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
entrypoint: ['/usr/local/bin/entrypoint.sh']
|
entrypoint: ['/usr/local/bin/entrypoint.sh']
|
||||||
|
@ -56,7 +56,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
coturn:
|
coturn:
|
||||||
image: openvidu/openvidu-coturn:2.30.0
|
image: openvidu/openvidu-coturn:2.31.0
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
network_mode: host
|
network_mode: host
|
||||||
env_file:
|
env_file:
|
||||||
|
@ -79,7 +79,7 @@ services:
|
||||||
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
image: openvidu/openvidu-proxy:2.30.0
|
image: openvidu/openvidu-proxy:2.31.0
|
||||||
restart: always
|
restart: always
|
||||||
network_mode: host
|
network_mode: host
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.31.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
OPENVIDU_UPGRADABLE_VERSION="2.30"
|
||||||
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
||||||
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM coturn/coturn:4.6.2-r8-alpine
|
FROM coturn/coturn:4.6.3-r2-alpine
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
VERSION=$1
|
VERSION=$1
|
||||||
if [[ ! -z $VERSION ]]; then
|
if [[ ! -z $VERSION ]]; then
|
||||||
docker build --pull --no-cache --rm=true -t "openvidu/openvidu-deployment-tester:${VERSION}" .
|
docker build -t "openvidu/openvidu-deployment-tester:${VERSION}" .
|
||||||
else
|
else
|
||||||
echo "Error: You need to specify a version as first argument"
|
echo "Error: You need to specify a version as first argument"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:20.04
|
FROM ubuntu:24.04
|
||||||
LABEL maintainer="info@openvidu.io"
|
LABEL maintainer="info@openvidu.io"
|
||||||
|
|
||||||
# Update and install dependencies
|
# Update and install dependencies
|
||||||
|
@ -7,7 +7,7 @@ RUN apt-get update && apt-get -y upgrade && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Install Kurento Media Server (KMS)
|
# 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-key adv --keyserver keyserver.ubuntu.com --recv-keys 234821A61B67740F89BFD669FC8A16625AFA7A83 && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get -y install kurento-media-server && \
|
apt-get -y install kurento-media-server && \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM nginx:1.25.5-alpine
|
FROM nginx:1.27.3-alpine
|
||||||
|
|
||||||
# Install required software
|
# Install required software
|
||||||
RUN apk update && \
|
RUN apk update && \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:22.04
|
FROM ubuntu:24.04
|
||||||
LABEL maintainer="OpenVidu info@openvidu.io"
|
LABEL maintainer="OpenVidu info@openvidu.io"
|
||||||
|
|
||||||
# Install packages
|
# Install packages
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:20.04
|
FROM ubuntu:24.04
|
||||||
MAINTAINER info@openvidu.io
|
MAINTAINER info@openvidu.io
|
||||||
|
|
||||||
# Install packages
|
# Install packages
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:22.04
|
FROM ubuntu:24.04
|
||||||
MAINTAINER info@openvidu.io
|
MAINTAINER info@openvidu.io
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:22.04
|
FROM ubuntu:24.04
|
||||||
MAINTAINER info@openvidu.io
|
MAINTAINER info@openvidu.io
|
||||||
|
|
||||||
# Install Java, supervisor and netstat
|
# Install Java, supervisor and netstat
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>OpenVidu Server</name>
|
<name>OpenVidu Server</name>
|
||||||
<version>2.30.0</version>
|
<version>2.31.0</version>
|
||||||
<description>OpenVidu Server</description>
|
<description>OpenVidu Server</description>
|
||||||
<url>https://openvidu.io</url>
|
<url>https://openvidu.io</url>
|
||||||
|
|
||||||
|
@ -235,6 +235,16 @@
|
||||||
<artifactId>docker-java</artifactId>
|
<artifactId>docker-java</artifactId>
|
||||||
<version>${version.dockerjava}</version>
|
<version>${version.dockerjava}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.docker-java</groupId>
|
||||||
|
<artifactId>docker-java-transport-zerodep</artifactId>
|
||||||
|
<version>${version.dockerjava}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.docker-java</groupId>
|
||||||
|
<artifactId>docker-java-api</artifactId>
|
||||||
|
<version>${version.dockerjava}</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.janino</groupId>
|
<groupId>org.codehaus.janino</groupId>
|
||||||
<artifactId>janino</artifactId>
|
<artifactId>janino</artifactId>
|
||||||
|
@ -251,6 +261,31 @@
|
||||||
<version>${version.maven.artifact}</version>
|
<version>${version.maven.artifact}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- fixed patched dependencies -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>ch.qos.logback</groupId>
|
||||||
|
<artifactId>logback-classic</artifactId>
|
||||||
|
<version>${version.logback}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
<artifactId>jackson-databind</artifactId>
|
||||||
|
<version>${version.jackson}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
<artifactId>jackson-core</artifactId>
|
||||||
|
<version>${version.jackson}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
<artifactId>jackson-annotations</artifactId>
|
||||||
|
<version>${version.jackson}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Test dependencies -->
|
<!-- Test dependencies -->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
"@angular/router": "15.0.2",
|
"@angular/router": "15.0.2",
|
||||||
"core-js": "3.26.1",
|
"core-js": "3.26.1",
|
||||||
"jquery": "3.6.1",
|
"jquery": "3.6.1",
|
||||||
"openvidu-browser": "2.30.0",
|
"openvidu-browser": "2.31.0",
|
||||||
"rxjs": "7.5.7",
|
"rxjs": "7.5.7",
|
||||||
"tslib": "2.4.1",
|
"tslib": "2.4.1",
|
||||||
"zone.js": "0.12.0"
|
"zone.js": "0.12.0"
|
||||||
|
@ -10123,9 +10123,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/openvidu-browser": {
|
"node_modules/openvidu-browser": {
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.30.0.tgz",
|
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.31.0.tgz",
|
||||||
"integrity": "sha512-OTtbo3gwdZp1i1I5DNHPRIPSoG7lJawXHXgYTUZ+IFrbXzvoBjJHilskJVLeAeTPcMwPLxJ96JLd+6sS946JWQ==",
|
"integrity": "sha512-68d3t+jI6SDcfQFzSB1lj9nEhcJc87+iqZTpR66s2j26/JlPNNzZ3yft1UCjhQFVogfqHIgvYiTCGkw+755LRQ==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"events": "3.3.0",
|
"events": "3.3.0",
|
||||||
"freeice": "2.2.2",
|
"freeice": "2.2.2",
|
||||||
|
@ -21741,9 +21742,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openvidu-browser": {
|
"openvidu-browser": {
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.30.0.tgz",
|
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.31.0.tgz",
|
||||||
"integrity": "sha512-OTtbo3gwdZp1i1I5DNHPRIPSoG7lJawXHXgYTUZ+IFrbXzvoBjJHilskJVLeAeTPcMwPLxJ96JLd+6sS946JWQ==",
|
"integrity": "sha512-68d3t+jI6SDcfQFzSB1lj9nEhcJc87+iqZTpR66s2j26/JlPNNzZ3yft1UCjhQFVogfqHIgvYiTCGkw+755LRQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"events": "3.3.0",
|
"events": "3.3.0",
|
||||||
"freeice": "2.2.2",
|
"freeice": "2.2.2",
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
"@angular/router": "15.0.2",
|
"@angular/router": "15.0.2",
|
||||||
"core-js": "3.26.1",
|
"core-js": "3.26.1",
|
||||||
"jquery": "3.6.1",
|
"jquery": "3.6.1",
|
||||||
"openvidu-browser": "2.30.0",
|
"openvidu-browser": "2.31.0",
|
||||||
"rxjs": "7.5.7",
|
"rxjs": "7.5.7",
|
||||||
"tslib": "2.4.1",
|
"tslib": "2.4.1",
|
||||||
"zone.js": "0.12.0"
|
"zone.js": "0.12.0"
|
||||||
|
@ -50,5 +50,5 @@
|
||||||
"start": "ng serve --host 0.0.0.0 --ssl",
|
"start": "ng serve --host 0.0.0.0 --ssl",
|
||||||
"test": "ng test"
|
"test": "ng test"
|
||||||
},
|
},
|
||||||
"version": "2.30.0"
|
"version": "2.31.0"
|
||||||
}
|
}
|
|
@ -51,8 +51,8 @@ import com.github.dockerjava.api.model.Volume;
|
||||||
import com.github.dockerjava.core.DefaultDockerClientConfig;
|
import com.github.dockerjava.core.DefaultDockerClientConfig;
|
||||||
import com.github.dockerjava.core.DockerClientBuilder;
|
import com.github.dockerjava.core.DockerClientBuilder;
|
||||||
import com.github.dockerjava.core.DockerClientConfig;
|
import com.github.dockerjava.core.DockerClientConfig;
|
||||||
import com.github.dockerjava.jaxrs.JerseyDockerHttpClient;
|
|
||||||
import com.github.dockerjava.transport.DockerHttpClient;
|
import com.github.dockerjava.transport.DockerHttpClient;
|
||||||
|
import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
|
|
||||||
import io.openvidu.client.OpenViduException;
|
import io.openvidu.client.OpenViduException;
|
||||||
|
@ -74,9 +74,12 @@ public class LocalDockerManager implements DockerManager {
|
||||||
@Override
|
@Override
|
||||||
public DockerManager init() {
|
public DockerManager init() {
|
||||||
DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
|
DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
|
||||||
DockerHttpClient dockerHttpClient = new JerseyDockerHttpClient.Builder()
|
DockerHttpClient dockerHttpClient = new ZerodepDockerHttpClient.Builder()
|
||||||
.dockerHost(dockerClientConfig.getDockerHost()).sslConfig(dockerClientConfig.getSSLConfig()).build();
|
.dockerHost(dockerClientConfig.getDockerHost())
|
||||||
this.dockerClient = DockerClientBuilder.getInstance(dockerClientConfig).withDockerHttpClient(dockerHttpClient)
|
.sslConfig(dockerClientConfig.getSSLConfig())
|
||||||
|
.build();
|
||||||
|
this.dockerClient = DockerClientBuilder.getInstance(dockerClientConfig)
|
||||||
|
.withDockerHttpClient(dockerHttpClient)
|
||||||
.build();
|
.build();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ OPENVIDU_WEBHOOK_EVENTS=["sessionCreated","sessionDestroyed","participantJoined"
|
||||||
|
|
||||||
OPENVIDU_RECORDING=false
|
OPENVIDU_RECORDING=false
|
||||||
OPENVIDU_RECORDING_DEBUG=false
|
OPENVIDU_RECORDING_DEBUG=false
|
||||||
OPENVIDU_RECORDING_VERSION=2.30.0
|
OPENVIDU_RECORDING_VERSION=2.31.0
|
||||||
OPENVIDU_RECORDING_PATH=/opt/openvidu/recordings
|
OPENVIDU_RECORDING_PATH=/opt/openvidu/recordings
|
||||||
OPENVIDU_RECORDING_PUBLIC_ACCESS=false
|
OPENVIDU_RECORDING_PUBLIC_ACCESS=false
|
||||||
OPENVIDU_RECORDING_NOTIFICATION=publisher_moderator
|
OPENVIDU_RECORDING_NOTIFICATION=publisher_moderator
|
||||||
|
|
|
@ -25,7 +25,7 @@ OPENVIDU_WEBHOOK_HEADERS=[]
|
||||||
OPENVIDU_WEBHOOK_EVENTS=["sessionCreated","sessionDestroyed","participantJoined","participantLeft","webrtcConnectionCreated","webrtcConnectionDestroyed","recordingStatusChanged","filterEventDispatched","mediaNodeStatusChanged","nodeCrashed","nodeRecovered","broadcastStarted","broadcastStopped"]
|
OPENVIDU_WEBHOOK_EVENTS=["sessionCreated","sessionDestroyed","participantJoined","participantLeft","webrtcConnectionCreated","webrtcConnectionDestroyed","recordingStatusChanged","filterEventDispatched","mediaNodeStatusChanged","nodeCrashed","nodeRecovered","broadcastStarted","broadcastStopped"]
|
||||||
|
|
||||||
OPENVIDU_RECORDING=false
|
OPENVIDU_RECORDING=false
|
||||||
OPENVIDU_RECORDING_VERSION=2.30.0
|
OPENVIDU_RECORDING_VERSION=2.31.0
|
||||||
OPENVIDU_RECORDING_PATH=/opt/openvidu/recordings
|
OPENVIDU_RECORDING_PATH=/opt/openvidu/recordings
|
||||||
OPENVIDU_RECORDING_PUBLIC_ACCESS=false
|
OPENVIDU_RECORDING_PUBLIC_ACCESS=false
|
||||||
OPENVIDU_RECORDING_NOTIFICATION=publisher_moderator
|
OPENVIDU_RECORDING_NOTIFICATION=publisher_moderator
|
||||||
|
|
|
@ -102,6 +102,13 @@
|
||||||
<artifactId>java-client</artifactId>
|
<artifactId>java-client</artifactId>
|
||||||
<version>${version.appium}</version>
|
<version>${version.appium}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- fixed patched dependencies -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>ch.qos.logback</groupId>
|
||||||
|
<artifactId>logback-classic</artifactId>
|
||||||
|
<version>${version.logback}</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:22.04
|
FROM ubuntu:24.04
|
||||||
|
|
||||||
LABEL maintainer="info@openvidu.io"
|
LABEL maintainer="info@openvidu.io"
|
||||||
|
|
||||||
|
@ -16,14 +16,14 @@ RUN apt-get update && apt-get -y upgrade && \
|
||||||
iproute2 \
|
iproute2 \
|
||||||
lsb-release \
|
lsb-release \
|
||||||
maven \
|
maven \
|
||||||
openjdk-11-jdk-headless \
|
openjdk-11-jdk \
|
||||||
rsync \
|
rsync \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
sudo && \
|
sudo && \
|
||||||
# Node
|
# Node
|
||||||
mkdir -p /etc/apt/keyrings && \
|
mkdir -p /etc/apt/keyrings && \
|
||||||
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
|
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
|
||||||
NODE_MAJOR=20 && \
|
NODE_MAJOR=22 && \
|
||||||
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list && \
|
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list && \
|
||||||
apt-get update && apt-get install nodejs -y && \
|
apt-get update && apt-get install nodejs -y && \
|
||||||
# Node
|
# Node
|
||||||
|
@ -31,6 +31,9 @@ RUN apt-get update && apt-get -y upgrade && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
apt-get autoremove --purge -y && apt-get autoclean
|
apt-get autoremove --purge -y && apt-get autoclean
|
||||||
|
|
||||||
|
# Change openjdk-11 as the default java
|
||||||
|
RUN update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
|
||||||
|
|
||||||
# Docker
|
# Docker
|
||||||
RUN sudo mkdir -p /etc/apt/keyrings && \
|
RUN sudo mkdir -p /etc/apt/keyrings && \
|
||||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
|
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
|
||||||
|
|
|
@ -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 && \
|
RUN apt-get -y update && \
|
||||||
apt-get install -y wget unzip
|
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 .
|
||||||
|
|
|
@ -107,6 +107,16 @@
|
||||||
<artifactId>docker-java</artifactId>
|
<artifactId>docker-java</artifactId>
|
||||||
<version>${version.dockerjava}</version>
|
<version>${version.dockerjava}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.docker-java</groupId>
|
||||||
|
<artifactId>docker-java-transport-zerodep</artifactId>
|
||||||
|
<version>${version.dockerjava}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.docker-java</groupId>
|
||||||
|
<artifactId>docker-java-api</artifactId>
|
||||||
|
<version>${version.dockerjava}</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.testcontainers</groupId>
|
<groupId>org.testcontainers</groupId>
|
||||||
<artifactId>testcontainers</artifactId>
|
<artifactId>testcontainers</artifactId>
|
||||||
|
@ -117,6 +127,30 @@
|
||||||
<artifactId>java-string-similarity</artifactId>
|
<artifactId>java-string-similarity</artifactId>
|
||||||
<version>${version.stringsimilarity}</version>
|
<version>${version.stringsimilarity}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- fixed patched dependencies -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>ch.qos.logback</groupId>
|
||||||
|
<artifactId>logback-classic</artifactId>
|
||||||
|
<version>${version.logback}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
<artifactId>jackson-databind</artifactId>
|
||||||
|
<version>${version.jackson}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
<artifactId>jackson-core</artifactId>
|
||||||
|
<version>${version.jackson}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
<artifactId>jackson-annotations</artifactId>
|
||||||
|
<version>${version.jackson}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -9,8 +9,8 @@ import com.github.dockerjava.api.command.ExecCreateCmdResponse;
|
||||||
import com.github.dockerjava.core.DefaultDockerClientConfig;
|
import com.github.dockerjava.core.DefaultDockerClientConfig;
|
||||||
import com.github.dockerjava.core.DockerClientBuilder;
|
import com.github.dockerjava.core.DockerClientBuilder;
|
||||||
import com.github.dockerjava.core.DockerClientConfig;
|
import com.github.dockerjava.core.DockerClientConfig;
|
||||||
import com.github.dockerjava.jaxrs.JerseyDockerHttpClient;
|
|
||||||
import com.github.dockerjava.transport.DockerHttpClient;
|
import com.github.dockerjava.transport.DockerHttpClient;
|
||||||
|
import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
|
||||||
|
|
||||||
public class MediaNodeDockerUtils {
|
public class MediaNodeDockerUtils {
|
||||||
|
|
||||||
|
@ -53,9 +53,13 @@ public class MediaNodeDockerUtils {
|
||||||
|
|
||||||
public static DockerClient getDockerClient() {
|
public static DockerClient getDockerClient() {
|
||||||
DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
|
DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
|
||||||
DockerHttpClient dockerHttpClient = new JerseyDockerHttpClient.Builder()
|
DockerHttpClient dockerHttpClient = new ZerodepDockerHttpClient.Builder()
|
||||||
.dockerHost(dockerClientConfig.getDockerHost()).sslConfig(dockerClientConfig.getSSLConfig()).build();
|
.dockerHost(dockerClientConfig.getDockerHost())
|
||||||
return DockerClientBuilder.getInstance(dockerClientConfig).withDockerHttpClient(dockerHttpClient).build();
|
.sslConfig(dockerClientConfig.getSSLConfig())
|
||||||
|
.build();
|
||||||
|
return DockerClientBuilder.getInstance(dockerClientConfig)
|
||||||
|
.withDockerHttpClient(dockerHttpClient)
|
||||||
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -472,6 +472,12 @@ public class OpenViduTestE2e {
|
||||||
}
|
}
|
||||||
if (!containerAlreadyRunning) {
|
if (!containerAlreadyRunning) {
|
||||||
container.start();
|
container.start();
|
||||||
|
try {
|
||||||
|
// Avoid error starting container
|
||||||
|
Thread.sleep(5000);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
containers.add(container);
|
containers.add(container);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1290,7 +1290,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
filterOptionsInput = user.getDriver().findElement(By.id("filter-options-field"));
|
filterOptionsInput = user.getDriver().findElement(By.id("filter-options-field"));
|
||||||
filterOptionsInput.clear();
|
filterOptionsInput.clear();
|
||||||
filterOptionsInput.sendKeys("{\"url\": \"https://openvidu.io/img/vb/red.jpg\"}");
|
filterOptionsInput.sendKeys("{\"url\": \"https://upload.wikimedia.org/wikipedia/commons/thumb/6/62/Solid_red.svg/1024px-Solid_red.svg.png\"}");
|
||||||
user.getDriver().findElement(By.id("apply-filter-btn")).click();
|
user.getDriver().findElement(By.id("apply-filter-btn")).click();
|
||||||
user.getWaiter().until(
|
user.getWaiter().until(
|
||||||
ExpectedConditions.attributeContains(By.id("operation-response-text-area"), "value", "Filter applied"));
|
ExpectedConditions.attributeContains(By.id("operation-response-text-area"), "value", "Filter applied"));
|
||||||
|
@ -1326,7 +1326,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
// Blue
|
// Blue
|
||||||
filterParamsInput.clear();
|
filterParamsInput.clear();
|
||||||
filterParamsInput.sendKeys("{\"url\": \"https://openvidu.io/img/vb/blue.jpg\"}");
|
filterParamsInput.sendKeys("{\"url\": \"https://png.pngtree.com/thumb_back/fw800/background/20210207/pngtree-blue-pure-color-simple-background-image_557085.jpg\"}");
|
||||||
user.getDriver().findElement(By.id("exec-filter-btn")).click();
|
user.getDriver().findElement(By.id("exec-filter-btn")).click();
|
||||||
user.getWaiter().until(ExpectedConditions.attributeContains(By.id("operation-response-text-area"), "value",
|
user.getWaiter().until(ExpectedConditions.attributeContains(By.id("operation-response-text-area"), "value",
|
||||||
"Filter method executed"));
|
"Filter method executed"));
|
||||||
|
@ -1391,7 +1391,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -1419,7 +1419,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -1491,7 +1491,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -1580,7 +1580,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -1656,7 +1656,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -1731,7 +1731,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -1803,7 +1803,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -1876,7 +1876,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -1949,7 +1949,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -2010,7 +2010,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -2082,7 +2082,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -2146,7 +2146,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -2232,7 +2232,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -2283,7 +2283,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -2333,7 +2333,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
config.put("OPENVIDU_PRO_NETWORK_QUALITY", false);
|
config.put("OPENVIDU_PRO_NETWORK_QUALITY", false);
|
||||||
config.put("OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT);
|
config.put("OPENVIDU_PRO_SPEECH_TO_TEXT", OPENVIDU_PRO_SPEECH_TO_TEXT);
|
||||||
config.put("OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand");
|
config.put("OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "on_demand");
|
||||||
config.put("OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", "openvidu/speech-to-text-custom:master");
|
config.put("OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", "openvidu/speech-to-text-custom:master-v2");
|
||||||
|
|
||||||
if (DOCKERHUB_PRIVATE_REGISTRY_PASSWORD != null && !"not_valid".equals(DOCKERHUB_PRIVATE_REGISTRY_PASSWORD)) {
|
if (DOCKERHUB_PRIVATE_REGISTRY_PASSWORD != null && !"not_valid".equals(DOCKERHUB_PRIVATE_REGISTRY_PASSWORD)) {
|
||||||
config.put("OPENVIDU_PRO_DOCKER_REGISTRIES", "[\"serveraddress=docker.io,username=openvidu,password="
|
config.put("OPENVIDU_PRO_DOCKER_REGISTRIES", "[\"serveraddress=docker.io,username=openvidu,password="
|
||||||
|
@ -2393,7 +2393,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
// STT Vosk manual
|
// STT Vosk manual
|
||||||
|
|
||||||
config = Map.of("OPENVIDU_PRO_SPEECH_TO_TEXT", "vosk", "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
config = Map.of("OPENVIDU_PRO_SPEECH_TO_TEXT", "vosk", "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"manual");
|
"manual");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -2554,7 +2554,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
log.info("Load Unload Model Error STT");
|
log.info("Load Unload Model Error STT");
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
"vosk", "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", "openvidu/speech-to-text-service:master",
|
"vosk", "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE", "openvidu/speech-to-text-service:master-v2",
|
||||||
"OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "manual");
|
"OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY", "manual");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -2701,7 +2701,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
|
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"manual", "OPENVIDU_PRO_CLUSTER_MEDIA_NODES", 3);
|
"manual", "OPENVIDU_PRO_CLUSTER_MEDIA_NODES", 3);
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
@ -3146,7 +3146,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
try {
|
try {
|
||||||
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
Map<String, Object> config = Map.of("OPENVIDU_PRO_NETWORK_QUALITY", false, "OPENVIDU_PRO_SPEECH_TO_TEXT",
|
||||||
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
OPENVIDU_PRO_SPEECH_TO_TEXT, "OPENVIDU_PRO_SPEECH_TO_TEXT_IMAGE",
|
||||||
"openvidu/speech-to-text-service:master", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
"openvidu/speech-to-text-service:master-v2", "OPENVIDU_PRO_SPEECH_TO_TEXT_VOSK_MODEL_LOAD_STRATEGY",
|
||||||
"on_demand");
|
"on_demand");
|
||||||
restartOpenViduServer(config);
|
restartOpenViduServer(config);
|
||||||
|
|
||||||
|
|
|
@ -1533,17 +1533,25 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
|
||||||
event = CustomWebhook.waitForEvent("recordingStatusChanged", 5); // started
|
event = CustomWebhook.waitForEvent("recordingStatusChanged", 5); // started
|
||||||
Assertions.assertEquals("started", event.get("status").getAsString(),
|
Assertions.assertEquals("started", event.get("status").getAsString(),
|
||||||
"Wrong status in recordingStatusChanged event");
|
"Wrong status in recordingStatusChanged event");
|
||||||
event = CustomWebhook.waitForEvent("recordingStatusChanged", 1); // failed
|
try {
|
||||||
|
// Wait first for a failed event
|
||||||
|
event = CustomWebhook.waitForEvent("recordingStatusChanged", 10); // failed
|
||||||
Assertions.assertEquals("failed", event.get("status").getAsString(),
|
Assertions.assertEquals("failed", event.get("status").getAsString(),
|
||||||
"Wrong status in recordingStatusChanged event");
|
"Wrong status in recordingStatusChanged event");
|
||||||
Assertions.assertEquals(Recording.Status.failed, OV.getRecording(sessionName + "~2").getStatus(),
|
Assertions.assertEquals(Recording.Status.failed, OV.getRecording(sessionName + "~2").getStatus(),
|
||||||
"Wrong recording status");
|
"Wrong recording status");
|
||||||
|
} catch (Exception e) {
|
||||||
|
// If the failed event is not received, it's because the session has been destroyed
|
||||||
|
// before the recording started
|
||||||
|
// Check for sessionDestroyed event
|
||||||
|
event = CustomWebhook.waitForEvent("sessionDestroyed", 5);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// Recording did have time to start. Should trigger started, stopped, ready
|
// Recording did have time to start. Should trigger started, stopped, ready
|
||||||
event = CustomWebhook.waitForEvent("recordingStatusChanged", 5); // started
|
event = CustomWebhook.waitForEvent("recordingStatusChanged", 5); // started
|
||||||
Assertions.assertEquals("stopped", event.get("status").getAsString(),
|
Assertions.assertEquals("stopped", event.get("status").getAsString(),
|
||||||
"Wrong status in recordingStatusChanged event");
|
"Wrong status in recordingStatusChanged event");
|
||||||
event = CustomWebhook.waitForEvent("recordingStatusChanged", 1); // failed
|
event = CustomWebhook.waitForEvent("recordingStatusChanged", 10); // failed
|
||||||
Assertions.assertEquals("ready", event.get("status").getAsString(),
|
Assertions.assertEquals("ready", event.get("status").getAsString(),
|
||||||
"Wrong status in recordingStatusChanged event");
|
"Wrong status in recordingStatusChanged event");
|
||||||
Assertions.assertEquals(Recording.Status.ready, OV.getRecording(sessionName + "~2").getStatus(),
|
Assertions.assertEquals(Recording.Status.ready, OV.getRecording(sessionName + "~2").getStatus(),
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "openvidu-testapp",
|
"name": "openvidu-testapp",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "openvidu-testapp",
|
"name": "openvidu-testapp",
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "14.2.12",
|
"@angular/animations": "14.2.12",
|
||||||
|
@ -23,8 +23,8 @@
|
||||||
"colormap": "2.3.2",
|
"colormap": "2.3.2",
|
||||||
"core-js": "3.26.1",
|
"core-js": "3.26.1",
|
||||||
"json-stringify-safe": "5.0.1",
|
"json-stringify-safe": "5.0.1",
|
||||||
"openvidu-browser": "2.30.0",
|
"openvidu-browser": "2.31.0",
|
||||||
"openvidu-node-client": "2.30.0",
|
"openvidu-node-client": "2.31.0",
|
||||||
"rxjs": "7.5.7",
|
"rxjs": "7.5.7",
|
||||||
"tslib": "2.4.1",
|
"tslib": "2.4.1",
|
||||||
"zone.js": "0.12.0"
|
"zone.js": "0.12.0"
|
||||||
|
@ -3537,7 +3537,8 @@
|
||||||
"node_modules/asynckit": {
|
"node_modules/asynckit": {
|
||||||
"version": "0.4.0",
|
"version": "0.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
|
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
|
||||||
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
|
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
|
||||||
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/autoprefixer": {
|
"node_modules/autoprefixer": {
|
||||||
"version": "10.4.13",
|
"version": "10.4.13",
|
||||||
|
@ -3573,9 +3574,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/axios": {
|
"node_modules/axios": {
|
||||||
"version": "1.7.1",
|
"version": "1.7.9",
|
||||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz",
|
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
|
||||||
"integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==",
|
"integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"follow-redirects": "^1.15.6",
|
"follow-redirects": "^1.15.6",
|
||||||
"form-data": "^4.0.0",
|
"form-data": "^4.0.0",
|
||||||
|
@ -4291,6 +4293,7 @@
|
||||||
"version": "1.0.8",
|
"version": "1.0.8",
|
||||||
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
|
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
|
||||||
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
|
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"delayed-stream": "~1.0.0"
|
"delayed-stream": "~1.0.0"
|
||||||
},
|
},
|
||||||
|
@ -4846,6 +4849,7 @@
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
|
||||||
"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
|
"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
|
||||||
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.4.0"
|
"node": ">=0.4.0"
|
||||||
}
|
}
|
||||||
|
@ -5869,9 +5873,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/form-data": {
|
"node_modules/form-data": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
|
||||||
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
|
"integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"asynckit": "^0.4.0",
|
"asynckit": "^0.4.0",
|
||||||
"combined-stream": "^1.0.8",
|
"combined-stream": "^1.0.8",
|
||||||
|
@ -8092,9 +8097,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/openvidu-browser": {
|
"node_modules/openvidu-browser": {
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.30.0.tgz",
|
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.31.0.tgz",
|
||||||
"integrity": "sha512-OTtbo3gwdZp1i1I5DNHPRIPSoG7lJawXHXgYTUZ+IFrbXzvoBjJHilskJVLeAeTPcMwPLxJ96JLd+6sS946JWQ==",
|
"integrity": "sha512-68d3t+jI6SDcfQFzSB1lj9nEhcJc87+iqZTpR66s2j26/JlPNNzZ3yft1UCjhQFVogfqHIgvYiTCGkw+755LRQ==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"events": "3.3.0",
|
"events": "3.3.0",
|
||||||
"freeice": "2.2.2",
|
"freeice": "2.2.2",
|
||||||
|
@ -8143,11 +8149,12 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/openvidu-node-client": {
|
"node_modules/openvidu-node-client": {
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"resolved": "https://registry.npmjs.org/openvidu-node-client/-/openvidu-node-client-2.30.0.tgz",
|
"resolved": "https://registry.npmjs.org/openvidu-node-client/-/openvidu-node-client-2.31.0.tgz",
|
||||||
"integrity": "sha512-WQzz535xow4n+LWxkdS7NQzGpnSvAFgyp20Gu74ggqaa/YasyAA44OtET+DtmMPREwNTPtigeA2oVkXS8JNbjA==",
|
"integrity": "sha512-wn9KiAlf0dbMUpsJ7f4JZWt9eSQMvUjbp93sTUTVQg3K0FYPfryn/f0c0dGS0pAZ5eUnpp/OmXhsPOUITjBxLA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "1.7.1",
|
"axios": "1.7.9",
|
||||||
"buffer": "6.0.3"
|
"buffer": "6.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -9314,7 +9321,8 @@
|
||||||
"node_modules/proxy-from-env": {
|
"node_modules/proxy-from-env": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
|
||||||
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
|
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
|
||||||
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/prr": {
|
"node_modules/prr": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
|
@ -14209,9 +14217,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"axios": {
|
"axios": {
|
||||||
"version": "1.7.1",
|
"version": "1.7.9",
|
||||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz",
|
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
|
||||||
"integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==",
|
"integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"follow-redirects": "^1.15.6",
|
"follow-redirects": "^1.15.6",
|
||||||
"form-data": "^4.0.0",
|
"form-data": "^4.0.0",
|
||||||
|
@ -15842,9 +15850,9 @@
|
||||||
"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
|
"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
|
||||||
},
|
},
|
||||||
"form-data": {
|
"form-data": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
|
||||||
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
|
"integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"asynckit": "^0.4.0",
|
"asynckit": "^0.4.0",
|
||||||
"combined-stream": "^1.0.8",
|
"combined-stream": "^1.0.8",
|
||||||
|
@ -17509,9 +17517,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openvidu-browser": {
|
"openvidu-browser": {
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.30.0.tgz",
|
"resolved": "https://registry.npmjs.org/openvidu-browser/-/openvidu-browser-2.31.0.tgz",
|
||||||
"integrity": "sha512-OTtbo3gwdZp1i1I5DNHPRIPSoG7lJawXHXgYTUZ+IFrbXzvoBjJHilskJVLeAeTPcMwPLxJ96JLd+6sS946JWQ==",
|
"integrity": "sha512-68d3t+jI6SDcfQFzSB1lj9nEhcJc87+iqZTpR66s2j26/JlPNNzZ3yft1UCjhQFVogfqHIgvYiTCGkw+755LRQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"events": "3.3.0",
|
"events": "3.3.0",
|
||||||
"freeice": "2.2.2",
|
"freeice": "2.2.2",
|
||||||
|
@ -17543,11 +17551,11 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"openvidu-node-client": {
|
"openvidu-node-client": {
|
||||||
"version": "2.30.0",
|
"version": "2.31.0",
|
||||||
"resolved": "https://registry.npmjs.org/openvidu-node-client/-/openvidu-node-client-2.30.0.tgz",
|
"resolved": "https://registry.npmjs.org/openvidu-node-client/-/openvidu-node-client-2.31.0.tgz",
|
||||||
"integrity": "sha512-WQzz535xow4n+LWxkdS7NQzGpnSvAFgyp20Gu74ggqaa/YasyAA44OtET+DtmMPREwNTPtigeA2oVkXS8JNbjA==",
|
"integrity": "sha512-wn9KiAlf0dbMUpsJ7f4JZWt9eSQMvUjbp93sTUTVQg3K0FYPfryn/f0c0dGS0pAZ5eUnpp/OmXhsPOUITjBxLA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"axios": "1.7.1",
|
"axios": "1.7.9",
|
||||||
"buffer": "6.0.3"
|
"buffer": "6.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
"colormap": "2.3.2",
|
"colormap": "2.3.2",
|
||||||
"core-js": "3.26.1",
|
"core-js": "3.26.1",
|
||||||
"json-stringify-safe": "5.0.1",
|
"json-stringify-safe": "5.0.1",
|
||||||
"openvidu-browser": "2.30.0",
|
"openvidu-browser": "2.31.0",
|
||||||
"openvidu-node-client": "2.30.0",
|
"openvidu-node-client": "2.31.0",
|
||||||
"rxjs": "7.5.7",
|
"rxjs": "7.5.7",
|
||||||
"tslib": "2.4.1",
|
"tslib": "2.4.1",
|
||||||
"zone.js": "0.12.0"
|
"zone.js": "0.12.0"
|
||||||
|
@ -46,5 +46,5 @@
|
||||||
"start:dev": "ng serve --open --configuration development",
|
"start:dev": "ng serve --open --configuration development",
|
||||||
"test": "ng test"
|
"test": "ng test"
|
||||||
},
|
},
|
||||||
"version": "2.30.0"
|
"version": "2.31.0"
|
||||||
}
|
}
|
12
pom.xml
12
pom.xml
|
@ -44,8 +44,8 @@
|
||||||
<properties>
|
<properties>
|
||||||
|
|
||||||
<version.spring-boot>2.7.18</version.spring-boot>
|
<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.java.client>2.31.0</version.openvidu.java.client>
|
||||||
<version.openvidu.client>1.1.0</version.openvidu.client>
|
<version.openvidu.client>1.1.0</version.openvidu.client>
|
||||||
<version.openvidu.test.browsers>1.1.0</version.openvidu.test.browsers>
|
<version.openvidu.test.browsers>1.1.0</version.openvidu.test.browsers>
|
||||||
<version.openvidu.test.e2e>1.1.1</version.openvidu.test.e2e>
|
<version.openvidu.test.e2e>1.1.1</version.openvidu.test.e2e>
|
||||||
|
@ -55,14 +55,18 @@
|
||||||
<version.mockito.core>4.9.0</version.mockito.core>
|
<version.mockito.core>4.9.0</version.mockito.core>
|
||||||
<version.powermock>2.0.9</version.powermock>
|
<version.powermock>2.0.9</version.powermock>
|
||||||
<version.janino>3.1.9</version.janino>
|
<version.janino>3.1.9</version.janino>
|
||||||
<version.dockerjava>3.2.13</version.dockerjava>
|
<version.dockerjava>3.4.1</version.dockerjava>
|
||||||
<version.slf4j>1.7.36</version.slf4j>
|
<version.slf4j>1.7.36</version.slf4j>
|
||||||
<version.gson>2.10</version.gson>
|
<version.gson>2.11.0</version.gson>
|
||||||
<version.jcodec>0.2.5</version.jcodec>
|
<version.jcodec>0.2.5</version.jcodec>
|
||||||
<version.testcontainers>1.17.6</version.testcontainers>
|
<version.testcontainers>1.17.6</version.testcontainers>
|
||||||
<version.appium>8.3.0</version.appium>
|
<version.appium>8.3.0</version.appium>
|
||||||
<version.stringsimilarity>2.0.0</version.stringsimilarity>
|
<version.stringsimilarity>2.0.0</version.stringsimilarity>
|
||||||
|
|
||||||
|
<!-- fixed patched versions -->
|
||||||
|
<version.logback>1.2.13</version.logback>
|
||||||
|
<version.jackson>2.13.5</version.jackson>
|
||||||
|
|
||||||
<version.compiler.plugin>3.10.1</version.compiler.plugin>
|
<version.compiler.plugin>3.10.1</version.compiler.plugin>
|
||||||
<version.enforcer.plugin>3.1.0</version.enforcer.plugin>
|
<version.enforcer.plugin>3.1.0</version.enforcer.plugin>
|
||||||
<version.extra.enforcer.rules.plugin>1.6.1</version.extra.enforcer.rules.plugin>
|
<version.extra.enforcer.rules.plugin>1.6.1</version.extra.enforcer.rules.plugin>
|
||||||
|
|
Loading…
Reference in New Issue