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 73446965..9fd09417 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 @@ -67,7 +67,7 @@ Resources: owner: "root" group: "root" "/usr/local/bin/installOpenviduCE.sh": - content: !Sub | + content: | #!/bin/bash set -eu -o pipefail @@ -75,6 +75,23 @@ Resources: cd /opt curl https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_OPENVIDU_VERSION.sh | bash + if [[ USE_MASTER_DOCKER_IMAGE == "true" ]]; then + + # docker-compose.yml replace with master version + IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" + for IMG in $IMAGES + do + sed -i "s|$IMG.*|$IMG:master|g" docker-compose.yml + done + + # docker-compose.override.yml replace with master version + IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" + for IMG in $IMAGES + do + sed -i "s|$IMG.*|$IMG:master|g" docker-compose.override.yml + done + fi + # Define Installation Type sed -i "s/Installation Mode: On Premises/Installation Mode: Cloud Formation/" /opt/openvidu/docker-compose.yml diff --git a/openvidu-server/deployments/ce/aws/createAMI.sh b/openvidu-server/deployments/ce/aws/createAMI.sh index c65f4af8..0a25a6f7 100755 --- a/openvidu-server/deployments/ce/aws/createAMI.sh +++ b/openvidu-server/deployments/ce/aws/createAMI.sh @@ -41,6 +41,7 @@ else sed -i '/ KeyName: AWS_KEY_NAME/d' cfn-mkt-ov-ce-ami.yaml fi sed -i "s/AWS_KEY_NAME/${AWS_KEY_NAME}/g" cfn-mkt-ov-ce-ami.yaml +sed -i "s/USE_MASTER_DOCKER_IMAGE/${USE_MASTER_DOCKER_IMAGE}/g" cfn-mkt-ov-ce-ami.yaml sed -i "s/OPENVIDU_VERSION/${OPENVIDU_VERSION}/g" cfn-mkt-ov-ce-ami.yaml sed -i "s/OPENVIDU_RECORDING_DOCKER_TAG/${OPENVIDU_RECORDING_DOCKER_TAG}/g" cfn-mkt-ov-ce-ami.yaml sed -i "s/AMIEUWEST1/${AMIEUWEST1}/g" cfn-mkt-ov-ce-ami.yaml 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 c0071902..6f8a10ff 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 @@ -75,6 +75,19 @@ Resources: cd /opt curl https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_media_node_OPENVIDU_VERSION.sh | bash + if [[ USE_MASTER_DOCKER_IMAGE == "true" ]]; then + + # docker-compose.yml replace with master version + IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" + for IMG in $IMAGES + do + sed -i "s|$IMG.*|$IMG:master|g" docker-compose.yml + done + + # Environment variables from docker-compose.yml + sed -i "s|MEDIASOUP_IMAGE=openvidu/mediasoup-controller.*|MEDIASOUP_IMAGE=openvidu/mediasoup-controller:master|g" docker-compose.yml + fi + # Define Installation Type sed -i "s/Installation Mode: On Premises/Installation Mode: Cloud Formation/" /opt/kms/docker-compose.yml 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 314e18ee..e20b580b 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 @@ -67,7 +67,7 @@ Resources: owner: "root" group: "root" "/usr/local/bin/installOpenviduServerPRO.sh": - content: !Sub | + content: | #!/bin/bash set -eu -o pipefail @@ -75,6 +75,23 @@ Resources: cd /opt curl https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/install_openvidu_pro_OPENVIDU_VERSION.sh | bash + if [[ USE_MASTER_DOCKER_IMAGE == "true" ]]; then + + # docker-compose.yml replace with master version + IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" + for IMG in $IMAGES + do + sed -i "s|$IMG.*|$IMG:master|g" docker-compose.yml + done + + # docker-compose.override.yml replace with master version + IMAGES="$(cat docker-compose.override.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')" + for IMG in $IMAGES + do + sed -i "s|$IMG.*|$IMG:master|g" docker-compose.override.yml + done + fi + # Define Installation Type sed -i "s/Installation Mode: On Premises/Installation Mode: Cloud Formation/" /opt/openvidu/docker-compose.yml mode: "000755" diff --git a/openvidu-server/deployments/pro/aws/createAMIs.sh b/openvidu-server/deployments/pro/aws/createAMIs.sh index 4f944a04..113d46c7 100755 --- a/openvidu-server/deployments/pro/aws/createAMIs.sh +++ b/openvidu-server/deployments/pro/aws/createAMIs.sh @@ -42,6 +42,7 @@ else sed -i '/ KeyName: AWS_KEY_NAME/d' cfn-mkt-kms-ami.yaml fi sed -i "s/AWS_KEY_NAME/${AWS_KEY_NAME}/g" cfn-mkt-ov-ami.yaml +sed -i "s/USE_MASTER_DOCKER_IMAGE/${USE_MASTER_DOCKER_IMAGE}/g" cfn-mkt-ov-ami.yaml sed -i "s/OPENVIDU_VERSION/${OPENVIDU_PRO_VERSION}/g" cfn-mkt-ov-ami.yaml sed -i "s/AWS_DOCKER_TAG/${AWS_DOCKER_TAG}/g" cfn-mkt-ov-ami.yaml sed -i "s/OPENVIDU_RECORDING_DOCKER_TAG/${OPENVIDU_RECORDING_DOCKER_TAG}/g" cfn-mkt-ov-ami.yaml @@ -49,6 +50,7 @@ sed -i "s/AMIEUWEST1/${AMIEUWEST1}/g" cfn-mkt-ov-ami.yaml sed -i "s/AMIUSEAST1/${AMIUSEAST1}/g" cfn-mkt-ov-ami.yaml sed -i "s/AWS_KEY_NAME/${AWS_KEY_NAME}/g" cfn-mkt-kms-ami.yaml +sed -i "s/USE_MASTER_DOCKER_IMAGE/${USE_MASTER_DOCKER_IMAGE}/g" cfn-mkt-kms-ami.yaml sed -i "s/OPENVIDU_VERSION/${OPENVIDU_PRO_VERSION}/g" cfn-mkt-kms-ami.yaml sed -i "s/OPENVIDU_RECORDING_DOCKER_TAG/${OPENVIDU_RECORDING_DOCKER_TAG}/g" cfn-mkt-kms-ami.yaml sed -i "s/AMIEUWEST1/${AMIEUWEST1}/g" cfn-mkt-kms-ami.yaml