From a60732bb716ba490847c24d7bdeae5cac0e5886f Mon Sep 17 00:00:00 2001 From: cruizba Date: Mon, 16 Nov 2020 15:32:21 +0100 Subject: [PATCH] openvidu-deployment: Parametrize aws cli docker tag --- ...fn-openvidu-server-pro-no-market.yaml.template | 15 ++++++++------- openvidu-server/deployments/pro/aws/createAMIs.sh | 1 + .../pro/docker-compose/openvidu-server-pro/.env | 1 + .../cluster/aws/openvidu_autodiscover.sh | 2 +- .../cluster/aws/openvidu_drop.sh | 2 +- .../cluster/aws/openvidu_launch_kms.sh | 6 +++--- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template index 68835aad..be514e33 100644 --- a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template @@ -487,6 +487,7 @@ Resources: sed -i "s/#AWS_SUBNET_ID=/AWS_SUBNET_ID=${OpenViduSubnet}/" $WORKINGDIR/.env sed -i "s/#AWS_STACK_ID=/AWS_STACK_ID=$(echo ${AWS::StackId} | sed 's#/#\\/#g')/" $WORKINGDIR/.env sed -i "s/#AWS_STACK_NAME=/AWS_STACK_NAME=${AWS::StackName}/" $WORKINGDIR/.env + sed -i "s/#AWS_CLI_DOCKER_TAG=/AWS_CLI_DOCKER_TAG=AWS_DOCKER_TAG/" $WORKINGDIR/.env # Get security group id of kms and use it as env variable SECGRPIDKMS=$(/usr/local/bin/getSecurityGroupKms.sh) @@ -526,7 +527,7 @@ Resources: '/usr/local/bin/getSecurityGroupKms.sh': content: !Sub | #!/bin/bash -x - docker run --rm amazon/aws-cli:2.0.7 ec2 describe-security-groups \ + docker run --rm amazon/aws-cli:AWS_DOCKER_TAG ec2 describe-security-groups \ --region ${AWS::Region} \ --output text \ --filters "Name=tag:aws:cloudformation:logical-id,Values=KMSSecurityGroup" \ @@ -538,7 +539,7 @@ Resources: '/usr/local/bin/getSecurityGroupOpenVidu.sh': content: !Sub | #!/bin/bash -x - docker run --rm amazon/aws-cli:2.0.7 ec2 describe-security-groups \ + docker run --rm amazon/aws-cli:AWS_DOCKER_TAG ec2 describe-security-groups \ --region ${AWS::Region} \ --output text \ --filters "Name=tag:aws:cloudformation:logical-id,Values=OpenViduSecurityGroup" \ @@ -550,7 +551,7 @@ Resources: '/usr/local/bin/getCidrBlocKSubnet.sh': content: !Sub | #!/bin/bash -x - docker run --rm amazon/aws-cli:2.0.7 ec2 describe-subnets \ + docker run --rm amazon/aws-cli:AWS_DOCKER_TAG ec2 describe-subnets \ --region ${AWS::Region} \ --output text \ --filters "Name=subnet-id,Values=${OpenViduSubnet}" \ @@ -566,12 +567,12 @@ Resources: SUBNET_CIDR=$(/usr/local/bin/getCidrBlocKSubnet.sh) # Create Security group rules OpenVidu - docker run --rm amazon/aws-cli:2.0.7 ec2 authorize-security-group-ingress --group-id $SECGRPIDOV --protocol tcp --port 5044 --cidr $SUBNET_CIDR - docker run --rm amazon/aws-cli:2.0.7 ec2 authorize-security-group-ingress --group-id $SECGRPIDOV --protocol tcp --port 9200 --cidr $SUBNET_CIDR + docker run --rm amazon/aws-cli:AWS_DOCKER_TAG ec2 authorize-security-group-ingress --group-id $SECGRPIDOV --protocol tcp --port 5044 --cidr $SUBNET_CIDR + docker run --rm amazon/aws-cli:AWS_DOCKER_TAG ec2 authorize-security-group-ingress --group-id $SECGRPIDOV --protocol tcp --port 9200 --cidr $SUBNET_CIDR # Create security group rules for KMS - docker run --rm amazon/aws-cli:2.0.7 ec2 authorize-security-group-ingress --group-id $SECGRPIDKMS --protocol tcp --port 8888 --cidr $SUBNET_CIDR - docker run --rm amazon/aws-cli:2.0.7 ec2 authorize-security-group-ingress --group-id $SECGRPIDKMS --protocol tcp --port 3000 --cidr $SUBNET_CIDR + docker run --rm amazon/aws-cli:AWS_DOCKER_TAG ec2 authorize-security-group-ingress --group-id $SECGRPIDKMS --protocol tcp --port 8888 --cidr $SUBNET_CIDR + docker run --rm amazon/aws-cli:AWS_DOCKER_TAG ec2 authorize-security-group-ingress --group-id $SECGRPIDKMS --protocol tcp --port 3000 --cidr $SUBNET_CIDR mode: "000755" owner: "root" diff --git a/openvidu-server/deployments/pro/aws/createAMIs.sh b/openvidu-server/deployments/pro/aws/createAMIs.sh index adbc6c88..7cf6fa1c 100755 --- a/openvidu-server/deployments/pro/aws/createAMIs.sh +++ b/openvidu-server/deployments/pro/aws/createAMIs.sh @@ -135,6 +135,7 @@ done # Updating the template sed "s/OV_AMI_ID/${OV_RAW_AMI_ID}/" cfn-openvidu-server-pro-no-market.yaml.template > cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml sed -i "s/KMS_AMI_ID/${KMS_RAW_AMI_ID}/g" cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml +sed -i "s/AWS_DOCKER_TAG/${AWS_DOCKER_TAG}/g" cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml rm $TEMPJSON rm cfn-mkt-kms-ami.yaml diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env index ccd97a47..1eb7d95f 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env @@ -324,3 +324,4 @@ ELASTICSEARCH_PASSWORD= #AWS_SECURITY_GROUP= #AWS_STACK_ID= #AWS_STACK_NAME= +#AWS_CLI_DOCKER_TAG= diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh index 0eb86058..8689f3b7 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_autodiscover.sh @@ -7,7 +7,7 @@ DEBUG=${DEBUG:-false} OUTPUT=$(mktemp -t openvidu-autodiscover-XXX --suffix .json) -docker run --rm amazon/aws-cli:2.0.7 ec2 describe-instances \ +docker run --rm amazon/aws-cli:${AWS_CLI_DOCKER_TAG} ec2 describe-instances \ --output text \ --filters "Name=instance-state-name,Values=running" \ "Name=tag:ov-cluster-member,Values=kms" \ diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_drop.sh b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_drop.sh index 27cc8d76..8d585480 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_drop.sh +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_drop.sh @@ -8,4 +8,4 @@ DEBUG=${DEBUG:-false} ID=$1 [ -z "${ID}" ] && { echo "Must provide instance ID"; exit 1; } -docker run --rm amazon/aws-cli:2.0.7 ec2 terminate-instances --instance-ids ${ID} --output json +docker run --rm amazon/aws-cli:${AWS_CLI_DOCKER_TAG} ec2 terminate-instances --instance-ids ${ID} --output json diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_launch_kms.sh b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_launch_kms.sh index 186ce5a0..07390b29 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_launch_kms.sh +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/cluster/aws/openvidu_launch_kms.sh @@ -23,7 +23,7 @@ exit_on_error () { "UnauthorizedOperation") MSG_COD=$(cat ${ERROUTPUT} | awk -F: '{ print $3 }') - MSG_DEC=$(docker run --rm amazon/aws-cli:2.0.7 sts decode-authorization-message --encoded-message ${MSG_COD}) + MSG_DEC=$(docker run --rm amazon/aws-cli:${AWS_CLI_DOCKER_TAG} sts decode-authorization-message --encoded-message ${MSG_COD}) echo -e "Unauthorized " $(cat ${MSG_DEC}) >&2 exit 1 @@ -35,7 +35,7 @@ exit_on_error () { esac } -docker run --rm amazon/aws-cli:2.0.7 ec2 run-instances \ +docker run --rm amazon/aws-cli:${AWS_CLI_DOCKER_TAG} ec2 run-instances \ --image-id ${AWS_IMAGE_ID} --count 1 \ --instance-type ${AWS_INSTANCE_TYPE} \ --key-name ${AWS_KEY_NAME} \ @@ -44,7 +44,7 @@ docker run --rm amazon/aws-cli:2.0.7 ec2 run-instances \ --iam-instance-profile Name="OpenViduInstanceProfile-${AWS_STACK_NAME}-${AWS_DEFAULT_REGION}" \ --security-group-ids ${AWS_SECURITY_GROUP} > ${OUTPUT} 2> ${ERROUTPUT} -docker run --rm amazon/aws-cli:2.0.7 ec2 wait instance-running --instance-ids $(cat ${OUTPUT} | jq --raw-output ' .Instances[] | .InstanceId') +docker run --rm amazon/aws-cli:${AWS_CLI_DOCKER_TAG} ec2 wait instance-running --instance-ids $(cat ${OUTPUT} | jq --raw-output ' .Instances[] | .InstanceId') # Generating the output KMS_IP=$(cat ${OUTPUT} | jq --raw-output ' .Instances[] | .NetworkInterfaces[0] | .PrivateIpAddress')