diff --git a/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template b/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template index 0eaebc99..8891ae86 100644 --- a/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template +++ b/openvidu-server/deployments/ce/aws/cfn-mkt-ov-ce-ami.yaml.template @@ -59,10 +59,16 @@ Resources: docker-ce-cli \ containerd.io - # Install docker-compose - curl -L "https://github.com/docker/compose/releases/download/1.25.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - chmod +x /usr/local/bin/docker-compose - ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose + # Install docker-compose v2 + DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker} + mkdir -p $DOCKER_CONFIG/cli-plugins + curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose + chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose + curl -fL https://raw.githubusercontent.com/docker/compose-switch/master/install_on_linux.sh | sh + curl -fL https://github.com/docker/compose-switch/releases/download/v1.0.4/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch + chmod +x /usr/local/bin/compose-switch + update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99 + mode: "000755" owner: "root" group: "root" diff --git a/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh b/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh index ca912ad9..046d3202 100755 --- a/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh +++ b/openvidu-server/deployments/ce/docker-compose/install_openvidu.sh @@ -6,6 +6,17 @@ OPENVIDU_VERSION=master OPENVIDU_UPGRADABLE_VERSION="2.21" DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION} +# Support docker compose v1 and v2 +shopt -s expand_aliases +alias docker-compose='docker compose' +if ! docker compose version &> /dev/null; then + unalias docker-compose +fi + +# Change default http timeout for slow networks +export COMPOSE_HTTP_TIMEOUT=500 +export DOCKER_CLIENT_TIMEOUT=500 + fatal_error() { printf "\n =======¡ERROR!=======" printf "\n %s" "$1" diff --git a/openvidu-server/deployments/ce/docker-compose/openvidu b/openvidu-server/deployments/ce/docker-compose/openvidu index 24320c50..e0e1e4e3 100755 --- a/openvidu-server/deployments/ce/docker-compose/openvidu +++ b/openvidu-server/deployments/ce/docker-compose/openvidu @@ -1,5 +1,16 @@ #!/bin/bash +# Support docker compose v1 and v2 +shopt -s expand_aliases +alias docker-compose='docker compose' +if ! docker compose version &> /dev/null; then + unalias docker-compose +fi + +# Change default http timeout for slow networks +export COMPOSE_HTTP_TIMEOUT=500 +export DOCKER_CLIENT_TIMEOUT=500 + upgrade_ov() { UPGRADE_SCRIPT_URL="https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_OVVERSION.sh" HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${UPGRADE_SCRIPT_URL//OVVERSION/$1}) diff --git a/openvidu-server/deployments/enterprise/master-node/install_openvidu_enterprise_master_node.sh b/openvidu-server/deployments/enterprise/master-node/install_openvidu_enterprise_master_node.sh index 3761e191..54f17746 100755 --- a/openvidu-server/deployments/enterprise/master-node/install_openvidu_enterprise_master_node.sh +++ b/openvidu-server/deployments/enterprise/master-node/install_openvidu_enterprise_master_node.sh @@ -9,6 +9,17 @@ ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch BEATS_FOLDER=${OPENVIDU_FOLDER}/beats DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION} +# Support docker compose v1 and v2 +shopt -s expand_aliases +alias docker-compose='docker compose' +if ! docker compose version &> /dev/null; then + unalias docker-compose +fi + +# Change default http timeout for slow networks +export COMPOSE_HTTP_TIMEOUT=500 +export DOCKER_CLIENT_TIMEOUT=500 + fatal_error() { printf "\n =======¡ERROR!=======" printf "\n %s" "$1" diff --git a/openvidu-server/deployments/enterprise/master-node/openvidu b/openvidu-server/deployments/enterprise/master-node/openvidu index 0551d4d7..9fdef2eb 100755 --- a/openvidu-server/deployments/enterprise/master-node/openvidu +++ b/openvidu-server/deployments/enterprise/master-node/openvidu @@ -1,5 +1,16 @@ #!/bin/bash +# Support docker compose v1 and v2 +shopt -s expand_aliases +alias docker-compose='docker compose' +if ! docker compose version &> /dev/null; then + unalias docker-compose +fi + +# Change default http timeout for slow networks +export COMPOSE_HTTP_TIMEOUT=500 +export DOCKER_CLIENT_TIMEOUT=500 + upgrade_ov() { UPGRADE_SCRIPT_URL="https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_pro_OVVERSION.sh" HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${UPGRADE_SCRIPT_URL//OVVERSION/$1}) diff --git a/openvidu-server/deployments/external-turn/install_openvidu_external_coturn.sh b/openvidu-server/deployments/external-turn/install_openvidu_external_coturn.sh index c4a059df..be99c7cd 100755 --- a/openvidu-server/deployments/external-turn/install_openvidu_external_coturn.sh +++ b/openvidu-server/deployments/external-turn/install_openvidu_external_coturn.sh @@ -6,6 +6,18 @@ COTURN_VERSION=master DOWNLOAD_URL="https://raw.githubusercontent.com/OpenVidu/openvidu/master/openvidu-server/deployments/external-turn/${COTURN_VERSION}" #COTURN_VERSION=4.5.2 #DOWNLOAD_URL="https://s3.eu-west-1.amazonaws.com/aws.openvidu.io/external-turn/${COTURN_VERSION}" + +# Support docker compose v1 and v2 +shopt -s expand_aliases +alias docker-compose='docker compose' +if ! docker compose version &> /dev/null; then + unalias docker-compose +fi + +# Change default http timeout for slow networks +export COMPOSE_HTTP_TIMEOUT=500 +export DOCKER_CLIENT_TIMEOUT=500 + fatal_error() { printf "\n =======¡ERROR!=======" printf "\n %s" "$1" diff --git a/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template b/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template index f44e0b6f..37a90847 100644 --- a/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template @@ -59,10 +59,16 @@ Resources: docker-ce-cli \ containerd.io - # Install docker-compose - curl -L "https://github.com/docker/compose/releases/download/1.25.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - chmod +x /usr/local/bin/docker-compose - ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose + # Install docker-compose v2 + DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker} + mkdir -p $DOCKER_CONFIG/cli-plugins + curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose + chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose + curl -fL https://raw.githubusercontent.com/docker/compose-switch/master/install_on_linux.sh | sh + curl -fL https://github.com/docker/compose-switch/releases/download/v1.0.4/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch + chmod +x /usr/local/bin/compose-switch + update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99 + mode: "000755" owner: "root" group: "root" diff --git a/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template b/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template index bcef238c..c16293f7 100644 --- a/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template @@ -59,10 +59,16 @@ Resources: docker-ce-cli \ containerd.io - # Install docker-compose - curl -L "https://github.com/docker/compose/releases/download/1.25.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - chmod +x /usr/local/bin/docker-compose - ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose + # Install docker-compose v2 + DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker} + mkdir -p $DOCKER_CONFIG/cli-plugins + curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose + chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose + curl -fL https://raw.githubusercontent.com/docker/compose-switch/master/install_on_linux.sh | sh + curl -fL https://github.com/docker/compose-switch/releases/download/v1.0.4/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch + chmod +x /usr/local/bin/compose-switch + update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99 + mode: "000755" owner: "root" group: "root" 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 33512255..5d8367e2 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 @@ -14,6 +14,17 @@ IMAGES=( "openvidu/mediasoup-controller" ) +# Support docker compose v1 and v2 +shopt -s expand_aliases +alias docker-compose='docker compose' +if ! docker compose version &> /dev/null; then + unalias docker-compose +fi + +# Change default http timeout for slow networks +export COMPOSE_HTTP_TIMEOUT=500 +export DOCKER_CLIENT_TIMEOUT=500 + fatal_error() { printf "\n =======¡ERROR!=======" printf "\n %s" "$1" diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/media_node b/openvidu-server/deployments/pro/docker-compose/media-node/media_node index d5c23ed7..7fe625a5 100755 --- a/openvidu-server/deployments/pro/docker-compose/media-node/media_node +++ b/openvidu-server/deployments/pro/docker-compose/media-node/media_node @@ -1,5 +1,16 @@ #!/bin/bash +# Support docker compose v1 and v2 +shopt -s expand_aliases +alias docker-compose='docker compose' +if ! docker compose version &> /dev/null; then + unalias docker-compose +fi + +# Change default http timeout for slow networks +export COMPOSE_HTTP_TIMEOUT=500 +export DOCKER_CLIENT_TIMEOUT=500 + # Deployed images in media-node IMAGES=( "kurento-media-server" diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh index 09529896..6d6095d7 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/install_openvidu_pro.sh @@ -9,6 +9,17 @@ ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch BEATS_FOLDER=${OPENVIDU_FOLDER}/beats DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION} +# Support docker compose v1 and v2 +shopt -s expand_aliases +alias docker-compose='docker compose' +if ! docker compose version &> /dev/null; then + unalias docker-compose +fi + +# Change default http timeout for slow networks +export COMPOSE_HTTP_TIMEOUT=500 +export DOCKER_CLIENT_TIMEOUT=500 + fatal_error() { printf "\n =======¡ERROR!=======" printf "\n %s" "$1" diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu index 0551d4d7..9fdef2eb 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu @@ -1,5 +1,16 @@ #!/bin/bash +# Support docker compose v1 and v2 +shopt -s expand_aliases +alias docker-compose='docker compose' +if ! docker compose version &> /dev/null; then + unalias docker-compose +fi + +# Change default http timeout for slow networks +export COMPOSE_HTTP_TIMEOUT=500 +export DOCKER_CLIENT_TIMEOUT=500 + upgrade_ov() { UPGRADE_SCRIPT_URL="https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_pro_OVVERSION.sh" HTTP_STATUS=$(curl -s -o /dev/null -I -w "%{http_code}" ${UPGRADE_SCRIPT_URL//OVVERSION/$1})