From 39be78b4e5cbeec70fe36be61f55e2a6fe0560f2 Mon Sep 17 00:00:00 2001 From: cruizba Date: Mon, 9 Nov 2020 14:18:40 +0100 Subject: [PATCH] openvidu-deployment: Some minor fixes nginx and update versions docker-compose --- .../deployments/ce/docker-compose/docker-compose.override.yml | 2 +- .../deployments/ce/docker-compose/docker-compose.yml | 2 +- .../pro/docker-compose/media-node/install_media_node.sh | 4 ++-- .../openvidu-server-pro/docker-compose.override.yml | 2 +- .../pro/docker-compose/openvidu-server-pro/docker-compose.yml | 4 ++-- openvidu-server/docker/openvidu-proxy/Dockerfile | 4 +++- .../openvidu-proxy/{default.conf => default-certbot.conf} | 0 openvidu-server/docker/openvidu-proxy/entrypoint.sh | 4 +++- 8 files changed, 13 insertions(+), 9 deletions(-) rename openvidu-server/docker/openvidu-proxy/{default.conf => default-certbot.conf} (100%) diff --git a/openvidu-server/deployments/ce/docker-compose/docker-compose.override.yml b/openvidu-server/deployments/ce/docker-compose/docker-compose.override.yml index ec6a4795..156db956 100644 --- a/openvidu-server/deployments/ce/docker-compose/docker-compose.override.yml +++ b/openvidu-server/deployments/ce/docker-compose/docker-compose.override.yml @@ -13,7 +13,7 @@ services: # # -------------------------------------------------------------- app: - image: openvidu/openvidu-call:2.16.0-dev1 + image: openvidu/openvidu-call:2.16.0-beta1 restart: on-failure network_mode: host environment: diff --git a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml index 12b6d75d..a44b356a 100644 --- a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml +++ b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml @@ -90,7 +90,7 @@ services: max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" nginx: - image: openvidu/openvidu-proxy:4.0.0-dev5 + image: openvidu/openvidu-proxy:4.0.0-dev6 restart: on-failure network_mode: host volumes: diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh b/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh index 5b7aa25e..d766159c 100755 --- a/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh +++ b/openvidu-server/deployments/pro/docker-compose/media-node/install_media_node.sh @@ -113,7 +113,7 @@ new_media_node_installation() { printf '\n 2. Start Media Node Controller' printf '\n $ ./media_node start' 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 in file located at "/opt/openvidu/.env" with this format:' printf '\n ...' @@ -319,7 +319,7 @@ upgrade_media_node() { printf '\n 3. Start new version of Media Node' printf '\n $ ./media_node start' 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 in file located at "/opt/openvidu/.env" with this format:' printf '\n ...' diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.override.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.override.yml index ec6a4795..156db956 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.override.yml +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.override.yml @@ -13,7 +13,7 @@ services: # # -------------------------------------------------------------- app: - image: openvidu/openvidu-call:2.16.0-dev1 + image: openvidu/openvidu-call:2.16.0-beta1 restart: on-failure network_mode: host environment: diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml index ca83607a..c2419af0 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml @@ -22,7 +22,7 @@ version: '3.1' services: openvidu-server: - image: openvidu/openvidu-server-pro:2.16.0-dev7 + image: openvidu/openvidu-server-pro:2.16.0-dev9 restart: on-failure network_mode: host entrypoint: ['/usr/local/bin/entrypoint.sh'] @@ -78,7 +78,7 @@ services: max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}" nginx: - image: openvidu/openvidu-proxy:4.0.0-dev5 + image: openvidu/openvidu-proxy:4.0.0-dev6 restart: on-failure network_mode: host volumes: diff --git a/openvidu-server/docker/openvidu-proxy/Dockerfile b/openvidu-server/docker/openvidu-proxy/Dockerfile index 3eb033f3..7198f9aa 100644 --- a/openvidu-server/docker/openvidu-proxy/Dockerfile +++ b/openvidu-server/docker/openvidu-proxy/Dockerfile @@ -10,8 +10,10 @@ RUN apk update && \ perl pcre grep && \ rm -rf /var/cache/apk/* +# Copy certbot default config +COPY ./default-certbot.conf /default-nginx-certbot-conf/default-certbot.conf + # Default nginx conf -COPY ./default.conf /etc/nginx/conf.d/default.conf COPY ./default_nginx_conf /default_nginx_conf # Entrypoint and discover public ip scripts diff --git a/openvidu-server/docker/openvidu-proxy/default.conf b/openvidu-server/docker/openvidu-proxy/default-certbot.conf similarity index 100% rename from openvidu-server/docker/openvidu-proxy/default.conf rename to openvidu-server/docker/openvidu-proxy/default-certbot.conf diff --git a/openvidu-server/docker/openvidu-proxy/entrypoint.sh b/openvidu-server/docker/openvidu-proxy/entrypoint.sh index 1b72f4e3..3c2fc897 100755 --- a/openvidu-server/docker/openvidu-proxy/entrypoint.sh +++ b/openvidu-server/docker/openvidu-proxy/entrypoint.sh @@ -102,7 +102,8 @@ fi echo -e "${DOMAIN_OR_PUBLIC_IP}\t${CERTIFICATE_TYPE}" > "${CERTIFICATES_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;" case ${CERTIFICATE_TYPE} in @@ -187,6 +188,7 @@ EOF # Load nginx conf files rm /etc/nginx/conf.d/* +rm /etc/nginx/vhost.d/default-certbot.conf cp /default_nginx_conf/default* /etc/nginx/conf.d # Replace config files