ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-deployment: Some minor fixes nginx and update versions docker-compose

pull/542/head
cruizba 2020-11-09 14:18:40 +01:00
parent e551521079
commit 39be78b4e5
8 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-server/deployments/ce/docker-compose/docker-compose.override.yml
View File

@ -13,7 +13,7 @@ services:
# #
# -------------------------------------------------------------- # --------------------------------------------------------------
app: app:
image: openvidu/openvidu-call:2.16.0-dev1 image: openvidu/openvidu-call:2.16.0-beta1
restart: on-failure restart: on-failure
network_mode: host network_mode: host
environment: environment:

2
openvidu-server/deployments/ce/docker-compose/docker-compose.yml
View File

@ -90,7 +90,7 @@ services:
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
nginx: nginx:
image: openvidu/openvidu-proxy:4.0.0-dev5 image: openvidu/openvidu-proxy:4.0.0-dev6
restart: on-failure restart: on-failure
network_mode: host network_mode: host
volumes: volumes:

4
openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh
View File

@ -113,7 +113,7 @@ new_media_node_installation() {
printf '\n 2. Start Media Node Controller' printf '\n 2. Start Media Node Controller'
printf '\n $ ./media_node start' printf '\n $ ./media_node start'
printf '\n' printf '\n'
printf '\n 3. This will run a service at port 3000 wich OpenVidu will use to deploy necessary containers.' printf '\n 3. This will run a service at port 3000 which OpenVidu will use to deploy necessary containers.'
printf '\n Add the private ip of this media node in "KMS_URIS=[]" in OpenVidu Pro machine' printf '\n Add the private ip of this media node in "KMS_URIS=[]" in OpenVidu Pro machine'
printf '\n in file located at "/opt/openvidu/.env" with this format:' printf '\n in file located at "/opt/openvidu/.env" with this format:'
printf '\n ...' printf '\n ...'
@ -319,7 +319,7 @@ upgrade_media_node() {
printf '\n 3. Start new version of Media Node' printf '\n 3. Start new version of Media Node'
printf '\n $ ./media_node start' printf '\n $ ./media_node start'
printf '\n' printf '\n'
printf '\n 4. This will run a service at port 3000 wich OpenVidu will use to deploy necessary containers.' printf '\n 4. This will run a service at port 3000 which OpenVidu will use to deploy necessary containers.'
printf '\n Add the private ip of this media node in "KMS_URIS=[]" in OpenVidu Pro machine' printf '\n Add the private ip of this media node in "KMS_URIS=[]" in OpenVidu Pro machine'
printf '\n in file located at "/opt/openvidu/.env" with this format:' printf '\n in file located at "/opt/openvidu/.env" with this format:'
printf '\n ...' printf '\n ...'

2
openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.override.yml
View File

@ -13,7 +13,7 @@ services:
# #
# -------------------------------------------------------------- # --------------------------------------------------------------
app: app:
image: openvidu/openvidu-call:2.16.0-dev1 image: openvidu/openvidu-call:2.16.0-beta1
restart: on-failure restart: on-failure
network_mode: host network_mode: host
environment: environment:

4
openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
View File

@ -22,7 +22,7 @@ version: '3.1'
services: services:
openvidu-server: openvidu-server:
image: openvidu/openvidu-server-pro:2.16.0-dev7 image: openvidu/openvidu-server-pro:2.16.0-dev9
restart: on-failure restart: on-failure
network_mode: host network_mode: host
entrypoint: ['/usr/local/bin/entrypoint.sh'] entrypoint: ['/usr/local/bin/entrypoint.sh']
@ -78,7 +78,7 @@ services:
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
nginx: nginx:
image: openvidu/openvidu-proxy:4.0.0-dev5 image: openvidu/openvidu-proxy:4.0.0-dev6
restart: on-failure restart: on-failure
network_mode: host network_mode: host
volumes: volumes:

4
openvidu-server/docker/openvidu-proxy/Dockerfile
View File

@ -10,8 +10,10 @@ RUN apk update && \
perl pcre grep && \ perl pcre grep && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
# Copy certbot default config
COPY ./default-certbot.conf /default-nginx-certbot-conf/default-certbot.conf
# Default nginx conf # Default nginx conf
COPY ./default.conf /etc/nginx/conf.d/default.conf
COPY ./default_nginx_conf /default_nginx_conf COPY ./default_nginx_conf /default_nginx_conf
# Entrypoint and discover public ip scripts # Entrypoint and discover public ip scripts

0
openvidu-server/docker/openvidu-proxy/default.conf → openvidu-server/docker/openvidu-proxy/default-certbot.conf
View File

4
openvidu-server/docker/openvidu-proxy/entrypoint.sh
View File

@ -102,7 +102,8 @@ fi
echo -e "${DOMAIN_OR_PUBLIC_IP}\t${CERTIFICATE_TYPE}" > "${CERTIFICATES_CONF}" echo -e "${DOMAIN_OR_PUBLIC_IP}\t${CERTIFICATE_TYPE}" > "${CERTIFICATES_CONF}"
# Start with default certbot conf # Start with default certbot conf
sed -i "s/{http_port}/${PROXY_HTTP_PORT}/" /etc/nginx/conf.d/default.conf cp /default-nginx-certbot-conf/default-certbot.conf /etc/nginx/vhost.d/default-certbot.conf
sed -i "s/{http_port}/${PROXY_HTTP_PORT}/" /etc/nginx/vhost.d/default-certbot.conf
nginx -g "daemon on;" nginx -g "daemon on;"
case ${CERTIFICATE_TYPE} in case ${CERTIFICATE_TYPE} in
@ -187,6 +188,7 @@ EOF
# Load nginx conf files # Load nginx conf files
rm /etc/nginx/conf.d/* rm /etc/nginx/conf.d/*
rm /etc/nginx/vhost.d/default-certbot.conf
cp /default_nginx_conf/default* /etc/nginx/conf.d cp /default_nginx_conf/default* /etc/nginx/conf.d
# Replace config files # Replace config files