mirror of https://github.com/OpenVidu/openvidu.git
Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
![]() |
9a2803cb06 | |
![]() |
4af3f75f1e | |
![]() |
c2b392d6d8 | |
![]() |
aac968eaba |
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.26.1
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
||||||
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
||||||
|
|
||||||
|
@ -299,17 +299,24 @@ upgrade_ov() {
|
||||||
# Check docker and docker-compose installation
|
# Check docker and docker-compose installation
|
||||||
if ! command -v docker > /dev/null; then
|
if ! command -v docker > /dev/null; then
|
||||||
echo "You don't have docker installed, please install it and re-run the command"
|
echo "You don't have docker installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
|
else
|
||||||
|
# Check version of docker is equal or higher than 20.10.10
|
||||||
|
DOCKER_VERSION=$(docker version --format '{{.Server.Version}}' | sed "s/-rc[0-9]*//")
|
||||||
|
if ! printf '%s\n%s\n' "20.10.10" "$DOCKER_VERSION" | sort -V -C; then
|
||||||
|
echo "You need a docker version equal or higher than 20.10.10, please update your docker and re-run the command"; \
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! command -v docker-compose > /dev/null; then
|
if ! command -v docker-compose > /dev/null; then
|
||||||
echo "You don't have docker-compose installed, please install it and re-run the command"
|
echo "You don't have docker-compose installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
else
|
else
|
||||||
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
||||||
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
||||||
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
||||||
exit 0
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -128,21 +128,20 @@ services:
|
||||||
- /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
|
- /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
|
||||||
- /:/hostfs:ro
|
- /:/hostfs:ro
|
||||||
entrypoint: >
|
entrypoint: >
|
||||||
/bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
|
/bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
|
||||||
ES_PROTO=$${BASH_REMATCH[1]}
|
ES_PROTO=$${BASH_REMATCH[1]}
|
||||||
ES_HOST=$${BASH_REMATCH[2]}
|
ES_HOST=$${BASH_REMATCH[2]}
|
||||||
|
ES_PORT=$${BASH_REMATCH[4]}
|
||||||
ES_PATH=$${BASH_REMATCH[5]}
|
ES_PATH=$${BASH_REMATCH[5]}
|
||||||
if [[ $$ES_PROTO == "https://" ]] && [[ -z $${BASH_REMATCH[4]} ]]; then
|
if [[ $$ES_PROTO == "https://" ]] && [[ -z $$ES_PORT ]]; then
|
||||||
ES_PORT=443
|
ES_PORT=443
|
||||||
else
|
elif [[ $$ES_PROTO == "http://" ]] && [[ -z $$ES_PORT ]]; then
|
||||||
ES_PORT=80
|
ES_PORT=80
|
||||||
fi;
|
fi
|
||||||
OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
|
export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
|
||||||
else
|
else
|
||||||
echo "Invalid OPENVIDU_PRO_ELASTICSEARCH_HOST"
|
|
||||||
echo "It must be a valid URL"
|
|
||||||
exit 1
|
exit 1
|
||||||
fi;
|
fi)
|
||||||
/bin/bash -c "$$@"'
|
/bin/bash -c "$$@"'
|
||||||
command: >
|
command: >
|
||||||
/bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs
|
/bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs
|
||||||
|
@ -166,21 +165,20 @@ services:
|
||||||
- /var/lib/docker:/var/lib/docker:ro
|
- /var/lib/docker:/var/lib/docker:ro
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
entrypoint: >
|
entrypoint: >
|
||||||
/bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
|
/bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
|
||||||
ES_PROTO=$${BASH_REMATCH[1]}
|
ES_PROTO=$${BASH_REMATCH[1]}
|
||||||
ES_HOST=$${BASH_REMATCH[2]}
|
ES_HOST=$${BASH_REMATCH[2]}
|
||||||
|
ES_PORT=$${BASH_REMATCH[4]}
|
||||||
ES_PATH=$${BASH_REMATCH[5]}
|
ES_PATH=$${BASH_REMATCH[5]}
|
||||||
if [[ $$ES_PROTO == "https://" ]] && [[ -z $${BASH_REMATCH[4]} ]]; then
|
if [[ $$ES_PROTO == "https://" ]] && [[ -z $$ES_PORT ]]; then
|
||||||
ES_PORT=443
|
ES_PORT=443
|
||||||
else
|
elif [[ $$ES_PROTO == "http://" ]] && [[ -z $$ES_PORT ]]; then
|
||||||
ES_PORT=80
|
ES_PORT=80
|
||||||
fi;
|
fi
|
||||||
OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
|
export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
|
||||||
else
|
else
|
||||||
echo "Invalid OPENVIDU_PRO_ELASTICSEARCH_HOST"
|
|
||||||
echo "It must be a valid URL"
|
|
||||||
exit 1
|
exit 1
|
||||||
fi;
|
fi)
|
||||||
/bin/bash -c "$$@"'
|
/bin/bash -c "$$@"'
|
||||||
command: >
|
command: >
|
||||||
/bin/bash -c "filebeat -e -strict.perms=false
|
/bin/bash -c "filebeat -e -strict.perms=false
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.26.1
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
||||||
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
||||||
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
||||||
|
@ -159,17 +159,24 @@ replace_variable_in_new_env_file() {
|
||||||
# Check docker and docker-compose installation
|
# Check docker and docker-compose installation
|
||||||
if ! command -v docker > /dev/null; then
|
if ! command -v docker > /dev/null; then
|
||||||
echo "You don't have docker installed, please install it and re-run the command"
|
echo "You don't have docker installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
|
else
|
||||||
|
# Check version of docker is equal or higher than 20.10.10
|
||||||
|
DOCKER_VERSION=$(docker version --format '{{.Server.Version}}' | sed "s/-rc[0-9]*//")
|
||||||
|
if ! printf '%s\n%s\n' "20.10.10" "$DOCKER_VERSION" | sort -V -C; then
|
||||||
|
echo "You need a docker version equal or higher than 20.10.10, please update your docker and re-run the command"; \
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! command -v docker-compose > /dev/null; then
|
if ! command -v docker-compose > /dev/null; then
|
||||||
echo "You don't have docker-compose installed, please install it and re-run the command"
|
echo "You don't have docker-compose installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
else
|
else
|
||||||
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
||||||
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
||||||
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
||||||
exit 0
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -87,17 +87,24 @@ new_coturn_installation() {
|
||||||
# Check docker and docker-compose installation
|
# Check docker and docker-compose installation
|
||||||
if ! command -v docker > /dev/null; then
|
if ! command -v docker > /dev/null; then
|
||||||
echo "You don't have docker installed, please install it and re-run the command"
|
echo "You don't have docker installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
|
else
|
||||||
|
# Check version of docker is equal or higher than 20.10.10
|
||||||
|
DOCKER_VERSION=$(docker version --format '{{.Server.Version}}' | sed "s/-rc[0-9]*//")
|
||||||
|
if ! printf '%s\n%s\n' "20.10.10" "$DOCKER_VERSION" | sort -V -C; then
|
||||||
|
echo "You need a docker version equal or higher than 20.10.10, please update your docker and re-run the command"; \
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! command -v docker-compose > /dev/null; then
|
if ! command -v docker-compose > /dev/null; then
|
||||||
echo "You don't have docker-compose installed, please install it and re-run the command"
|
echo "You don't have docker-compose installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
else
|
else
|
||||||
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
||||||
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
||||||
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
||||||
exit 0
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -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.26.1
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
||||||
BEATS_FOLDER=${MEDIA_NODE_FOLDER}/beats
|
BEATS_FOLDER=${MEDIA_NODE_FOLDER}/beats
|
||||||
OPENVIDU_RECORDINGS_FOLDER="/opt/openvidu/recordings"
|
OPENVIDU_RECORDINGS_FOLDER="/opt/openvidu/recordings"
|
||||||
|
@ -365,17 +365,24 @@ upgrade_media_node() {
|
||||||
# Check docker and docker-compose installation
|
# Check docker and docker-compose installation
|
||||||
if ! command -v docker > /dev/null; then
|
if ! command -v docker > /dev/null; then
|
||||||
echo "You don't have docker installed, please install it and re-run the command"
|
echo "You don't have docker installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
|
else
|
||||||
|
# Check version of docker is equal or higher than 20.10.10
|
||||||
|
DOCKER_VERSION=$(docker version --format '{{.Server.Version}}' | sed "s/-rc[0-9]*//")
|
||||||
|
if ! printf '%s\n%s\n' "20.10.10" "$DOCKER_VERSION" | sort -V -C; then
|
||||||
|
echo "You need a docker version equal or higher than 20.10.10, please update your docker and re-run the command"; \
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! command -v docker-compose > /dev/null; then
|
if ! command -v docker-compose > /dev/null; then
|
||||||
echo "You don't have docker-compose installed, please install it and re-run the command"
|
echo "You don't have docker-compose installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
else
|
else
|
||||||
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
||||||
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
||||||
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
||||||
exit 0
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.26.1
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
||||||
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
||||||
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
||||||
|
@ -387,17 +387,24 @@ upgrade_ov() {
|
||||||
# Check docker and docker-compose installation
|
# Check docker and docker-compose installation
|
||||||
if ! command -v docker > /dev/null; then
|
if ! command -v docker > /dev/null; then
|
||||||
echo "You don't have docker installed, please install it and re-run the command"
|
echo "You don't have docker installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
|
else
|
||||||
|
# Check version of docker is equal or higher than 20.10.10
|
||||||
|
DOCKER_VERSION=$(docker version --format '{{.Server.Version}}' | sed "s/-rc[0-9]*//")
|
||||||
|
if ! printf '%s\n%s\n' "20.10.10" "$DOCKER_VERSION" | sort -V -C; then
|
||||||
|
echo "You need a docker version equal or higher than 20.10.10, please update your docker and re-run the command"; \
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! command -v docker-compose > /dev/null; then
|
if ! command -v docker-compose > /dev/null; then
|
||||||
echo "You don't have docker-compose installed, please install it and re-run the command"
|
echo "You don't have docker-compose installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
else
|
else
|
||||||
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
||||||
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
||||||
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
||||||
exit 0
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -161,21 +161,20 @@ services:
|
||||||
- /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
|
- /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
|
||||||
- /:/hostfs:ro
|
- /:/hostfs:ro
|
||||||
entrypoint: >
|
entrypoint: >
|
||||||
/bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
|
/bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
|
||||||
ES_PROTO=$${BASH_REMATCH[1]}
|
ES_PROTO=$${BASH_REMATCH[1]}
|
||||||
ES_HOST=$${BASH_REMATCH[2]}
|
ES_HOST=$${BASH_REMATCH[2]}
|
||||||
|
ES_PORT=$${BASH_REMATCH[4]}
|
||||||
ES_PATH=$${BASH_REMATCH[5]}
|
ES_PATH=$${BASH_REMATCH[5]}
|
||||||
if [[ $$ES_PROTO == "https://" ]] && [[ -z $${BASH_REMATCH[4]} ]]; then
|
if [[ $$ES_PROTO == "https://" ]] && [[ -z $$ES_PORT ]]; then
|
||||||
ES_PORT=443
|
ES_PORT=443
|
||||||
else
|
elif [[ $$ES_PROTO == "http://" ]] && [[ -z $$ES_PORT ]]; then
|
||||||
ES_PORT=80
|
ES_PORT=80
|
||||||
fi;
|
fi
|
||||||
OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
|
export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
|
||||||
else
|
else
|
||||||
echo "Invalid OPENVIDU_PRO_ELASTICSEARCH_HOST"
|
|
||||||
echo "It must be a valid URL"
|
|
||||||
exit 1
|
exit 1
|
||||||
fi;
|
fi)
|
||||||
/bin/bash -c "$$@"'
|
/bin/bash -c "$$@"'
|
||||||
command: >
|
command: >
|
||||||
/bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs
|
/bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs
|
||||||
|
@ -199,21 +198,20 @@ services:
|
||||||
- /var/lib/docker:/var/lib/docker:ro
|
- /var/lib/docker:/var/lib/docker:ro
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
entrypoint: >
|
entrypoint: >
|
||||||
/bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
|
/bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
|
||||||
ES_PROTO=$${BASH_REMATCH[1]}
|
ES_PROTO=$${BASH_REMATCH[1]}
|
||||||
ES_HOST=$${BASH_REMATCH[2]}
|
ES_HOST=$${BASH_REMATCH[2]}
|
||||||
|
ES_PORT=$${BASH_REMATCH[4]}
|
||||||
ES_PATH=$${BASH_REMATCH[5]}
|
ES_PATH=$${BASH_REMATCH[5]}
|
||||||
if [[ $$ES_PROTO == "https://" ]] && [[ -z $${BASH_REMATCH[4]} ]]; then
|
if [[ $$ES_PROTO == "https://" ]] && [[ -z $$ES_PORT ]]; then
|
||||||
ES_PORT=443
|
ES_PORT=443
|
||||||
else
|
elif [[ $$ES_PROTO == "http://" ]] && [[ -z $$ES_PORT ]]; then
|
||||||
ES_PORT=80
|
ES_PORT=80
|
||||||
fi;
|
fi
|
||||||
OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
|
export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
|
||||||
else
|
else
|
||||||
echo "Invalid OPENVIDU_PRO_ELASTICSEARCH_HOST"
|
|
||||||
echo "It must be a valid URL"
|
|
||||||
exit 1
|
exit 1
|
||||||
fi;
|
fi)
|
||||||
/bin/bash -c "$$@"'
|
/bin/bash -c "$$@"'
|
||||||
command: >
|
command: >
|
||||||
/bin/bash -c "filebeat -e -strict.perms=false
|
/bin/bash -c "filebeat -e -strict.perms=false
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.26.1
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
OPENVIDU_UPGRADABLE_VERSION="2.25"
|
||||||
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
||||||
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
||||||
|
@ -458,17 +458,24 @@ upgrade_ov() {
|
||||||
# Check docker and docker-compose installation
|
# Check docker and docker-compose installation
|
||||||
if ! command -v docker > /dev/null; then
|
if ! command -v docker > /dev/null; then
|
||||||
echo "You don't have docker installed, please install it and re-run the command"
|
echo "You don't have docker installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
|
else
|
||||||
|
# Check version of docker is equal or higher than 20.10.10
|
||||||
|
DOCKER_VERSION=$(docker version --format '{{.Server.Version}}' | sed "s/-rc[0-9]*//")
|
||||||
|
if ! printf '%s\n%s\n' "20.10.10" "$DOCKER_VERSION" | sort -V -C; then
|
||||||
|
echo "You need a docker version equal or higher than 20.10.10, please update your docker and re-run the command"; \
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! command -v docker-compose > /dev/null; then
|
if ! command -v docker-compose > /dev/null; then
|
||||||
echo "You don't have docker-compose installed, please install it and re-run the command"
|
echo "You don't have docker-compose installed, please install it and re-run the command"
|
||||||
exit 0
|
exit 1
|
||||||
else
|
else
|
||||||
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
COMPOSE_VERSION=$(docker-compose version --short | sed "s/-rc[0-9]*//")
|
||||||
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
if ! printf '%s\n%s\n' "1.24" "$COMPOSE_VERSION" | sort -V -C; then
|
||||||
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
echo "You need a docker-compose version equal or higher than 1.24, please update your docker-compose and re-run the command"; \
|
||||||
exit 0
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue