Update createAMI.sh scripts and yaml templates with new var names

2023-03-18 02:54:09 +01:00 · 2023-03-18 02:54:09 +01:00 · eae721a45b
parent 3c363878a1
commit eae721a45b
7 changed files with 31 additions and 28 deletions
--- 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
@ -82,7 +82,7 @@ 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
+                if [[ USE_MASTER_DOCKER_IMAGES == "true" ]]; then
                  pushd openvidu
                  # docker-compose.yml replace with master version
                  IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
--- a/openvidu-server/deployments/ce/aws/createAMI.sh
+++ b/openvidu-server/deployments/ce/aws/createAMI.sh
@ -40,7 +40,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/USE_MASTER_DOCKER_IMAGES/${USE_MASTER_DOCKER_IMAGES}/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
@ -53,7 +53,7 @@ aws s3 cp cfn-mkt-ov-ce-ami.yaml s3://aws.openvidu.io
 TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-ov-ce-ami.yaml

 # Update installation script
-if [[ ${UPDATE_INSTALLATION_SCRIPT} == "true" ]]; then
+if [[ ${UPDATE_S3_FILES} == "true" ]]; then
  # Avoid overriding existing versions
  # Only master and non existing versions can be overriden
  if [[ ${OPENVIDU_VERSION} != "master" ]]; then
@ -111,7 +111,7 @@ sed "s/OV_AMI_ID/${OV_RAW_AMI_ID}/" CF-OpenVidu.yaml.template >CF-OpenVidu-${OPE
 sed -i "s/OPENVIDU_VERSION/${OPENVIDU_VERSION}/g" CF-OpenVidu-${OPENVIDU_VERSION}.yaml

 # Update CF template
-if [[ ${UPDATE_CF} == "true" ]]; then
+if [[ ${UPDATE_S3_FILES} == "true" ]]; then
  # Avoid overriding existing versions
  # Only master and non existing versions can be overriden
  if [[ ${OPENVIDU_VERSION} != "master" ]]; then
--- 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
@ -12,8 +12,8 @@ DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERS
 # 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
+if ! docker compose version &>/dev/null; then
+     unalias docker-compose
 fi

 # Change default http timeout for slow networks
@ -21,10 +21,10 @@ export COMPOSE_HTTP_TIMEOUT=500
 export DOCKER_CLIENT_TIMEOUT=500

 fatal_error() {
-    printf "\n     =======¡ERROR!======="
-    printf "\n     %s" "$1"
-    printf "\n"
-    exit 1
+     printf "\n     =======¡ERROR!======="
+     printf "\n     %s" "$1"
+     printf "\n"
+     exit 1
 }

 new_ov_installation() {
@ -139,7 +139,7 @@ new_ov_installation() {
     printf "\n     CAUTION: The folder 'openvidu/elasticsearch' use user and group 1000 permissions. "
     printf "\n     This folder is necessary for store elasticsearch data."
     printf "\n     For more information, check:"
-     printf '\n     https://docs.openvidu.io/en/%s/openvidu-pro/deployment/on-premises/#deployment-instructions' "${OPENVIDU_VERSION//v}"
+     printf '\n     https://docs.openvidu.io/en/%s/openvidu-pro/deployment/on-premises/#deployment-instructions' "${OPENVIDU_VERSION//v/}"
     printf '\n'
     printf '\n'
     exit 0
@ -157,32 +157,32 @@ replace_variable_in_new_env_file() {
 }

 # 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"
     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"; \
+          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

-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"
     exit 1
 else
     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
-          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 1
     fi
 fi

 # Check type of installation
 if [[ -n "$1" && "$1" == "upgrade" ]]; then
-     fatal_error "OpenVidu Enterprise HA can't be upgraded manually. Deploy the Cloudformation template of the version '${OPENVIDU_VERSION}' you want to deploy: https://docs.openvidu.io/en/${OPENVIDU_VERSION//v}/deployment/enterprise/aws/"
+     fatal_error "OpenVidu Enterprise HA can't be upgraded manually. Deploy the Cloudformation template of the version '${OPENVIDU_VERSION}' you want to deploy: https://docs.openvidu.io/en/${OPENVIDU_VERSION//v/}/deployment/enterprise/aws/"
 else
     new_ov_installation
 fi
--- a/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template
+++ b/openvidu-server/deployments/pro/aws/cfn-mkt-kms-ami.yaml.template
@ -82,7 +82,7 @@ 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
+                if [[ USE_MASTER_DOCKER_IMAGES == "true" ]]; then
                  pushd kms
                  # docker-compose.yml replace with master version
                  IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
--- a/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template
+++ b/openvidu-server/deployments/pro/aws/cfn-mkt-ov-ami.yaml.template
@ -82,7 +82,7 @@ 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
+                if [[ USE_MASTER_DOCKER_IMAGES == "true" ]]; then
                  pushd openvidu
                  # docker-compose.yml replace with master version
                  IMAGES="$(cat docker-compose.yml | grep 'image: openvidu/' | cut -d':' -f2 | sed -e 's/^[[:space:]]*//')"
@ -113,7 +113,7 @@ Resources:
                set -eu -o pipefail

                # AWS cli
-                docker pull amazon/aws-cli:AWS_DOCKER_TAG
+                docker pull amazon/aws-cli:AWS_CLI_DOCKER_TAG

                # Openvidu recording
                docker pull openvidu/openvidu-recording:OPENVIDU_RECORDING_DOCKER_TAG
--- 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
@ -610,7 +610,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
+                sed -i "s/#AWS_CLI_DOCKER_TAG=/AWS_CLI_DOCKER_TAG=AWS_CLI_DOCKER_TAG/" $WORKINGDIR/.env
                sed -i "s/#AWS_VOLUME_SIZE=/AWS_VOLUME_SIZE=50/" $WORKINGDIR/.env
                sed -i "s/#OPENVIDU_PRO_AWS_REGION=/OPENVIDU_PRO_AWS_REGION=${AWS::Region}/" $WORKINGDIR/.env

@ -657,7 +657,7 @@ Resources:
            '/usr/local/bin/getSecurityGroupKms.sh':
              content: !Sub |
                #!/bin/bash -x
-                docker run --rm amazon/aws-cli:AWS_DOCKER_TAG ec2 describe-security-groups \
+                docker run --rm amazon/aws-cli:AWS_CLI_DOCKER_TAG ec2 describe-security-groups \
                                --region ${AWS::Region} \
                                --output text \
                                --filters "Name=tag:aws:cloudformation:logical-id,Values=KMSSecurityGroup" \
--- a/openvidu-server/deployments/pro/aws/createAMIs.sh
+++ b/openvidu-server/deployments/pro/aws/createAMIs.sh
@ -42,15 +42,15 @@ 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/USE_MASTER_DOCKER_IMAGES/${USE_MASTER_DOCKER_IMAGES}/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/AWS_CLI_DOCKER_TAG/${AWS_CLI_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
 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/USE_MASTER_DOCKER_IMAGES/${USE_MASTER_DOCKER_IMAGES}/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
@ -63,7 +63,7 @@ aws s3 cp cfn-mkt-kms-ami.yaml s3://aws.openvidu.io
 TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-kms-ami.yaml

 # Update installation script
-if [[ ${UPDATE_INSTALLATION_SCRIPT} == "true" ]]; then
+if [[ ${UPDATE_S3_FILES} == "true" ]]; then
  # Avoid overriding existing versions
  # Only master and non existing versions can be overriden
  if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then
@ -123,7 +123,7 @@ aws s3 cp cfn-mkt-ov-ami.yaml s3://aws.openvidu.io
 TEMPLATE_URL=https://s3-eu-west-1.amazonaws.com/aws.openvidu.io/cfn-mkt-ov-ami.yaml

 # Update installation script
-if [[ ${UPDATE_INSTALLATION_SCRIPT} == "true" ]]; then
+if [[ ${UPDATE_S3_FILES} == "true" ]]; then
  # Avoid overriding existing versions
  # Only master and non existing versions can be overriden
  if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then
@ -179,10 +179,10 @@ fi
 # 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
+sed -i "s/AWS_CLI_DOCKER_TAG/${AWS_CLI_DOCKER_TAG}/g" cfn-openvidu-server-pro-no-market-${OPENVIDU_PRO_VERSION}.yaml

 # Update CF template
-if [[ ${UPDATE_CF} == "true" ]]; then
+if [[ ${UPDATE_S3_FILES} == "true" ]]; then
  # Avoid overriding existing versions
  # Only master and non existing versions can be overriden
  if [[ ${OPENVIDU_PRO_VERSION} != "master" ]]; then
@ -199,3 +199,6 @@ fi
 rm $TEMPJSON
 rm cfn-mkt-kms-ami.yaml
 rm cfn-mkt-ov-ami.yaml
+
+# Return the KMS AMI identifier to the standard output
+echo ${KMS_RAW_AMI_ID}