diff --git a/ansible/roles/stack-api-manager/templates/stack-api-manager.yml b/ansible/roles/stack-api-manager/templates/stack-api-manager.yml index d98d3eebf30622f9aa58e7aed3714744ff0937e1..506ba864c8f59f03f81a026530cb2f9ee24e2f4c 100644 --- a/ansible/roles/stack-api-manager/templates/stack-api-manager.yml +++ b/ansible/roles/stack-api-manager/templates/stack-api-manager.yml @@ -2,7 +2,7 @@ version: '3' services: kong: - image: sunbird/kong:1.5.0-gold + image: sunbird/kong:{{kong_version}} env_file: /home/deployer/env/api-manager.env ports: diff --git a/deploy/deploy-apis.sh b/deploy/deploy-apis.sh index d9a4e75014189a2588770830941910a3bc4582ce..072ae51664a121e698eac388d7e43a5fe9c3166c 100755 --- a/deploy/deploy-apis.sh +++ b/deploy/deploy-apis.sh @@ -8,6 +8,8 @@ if [ "$#" -ne 1 ]; then fi INVENTORY_PATH=$1 +# Importing variables +source version.env ORG=sunbird ECHO_SERVER_VERSION=0.0.2-silver @@ -20,7 +22,7 @@ ansible-playbook -i $INVENTORY_PATH ../ansible/bootstrap.yml --extra-vars "host # Deploy API Manager echo "@@@@@@@@@ Deploy API Manager" -ansible-playbook -i $INVENTORY_PATH ../ansible/deploy.yml --tags "stack-api-manager" --extra-vars "hub_org=${ORG} echo_server_image_name=echo-server echo_server_image_tag=${ECHO_SERVER_VERSION}" --extra-vars=@config +ansible-playbook -i $INVENTORY_PATH ../ansible/deploy.yml --tags "stack-api-manager" --extra-vars "hub_org=${ORG} echo_server_image_name=echo-server echo_server_image_tag=${ECHO_SERVER_VERSION} kong_version=${KONG_VERSION}" --extra-vars=@config # Deploy Admin Utils API echo "@@@@@@@@@ Deploy Admin Utils API" diff --git a/deploy/deploy-core.sh b/deploy/deploy-core.sh index 06c9fbdd29b29923fcec709b9455edae332c4be2..c46876252b4d64d6f2f2bc435e5d71e42ea80f89 100755 --- a/deploy/deploy-core.sh +++ b/deploy/deploy-core.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e if [ "$#" -ne 1 ]; then diff --git a/deploy/deploy-proxy.sh b/deploy/deploy-proxy.sh index e93fe25bc1ad0f9867bc6159b7c7fa1895194db4..c19dd5f7a7cddf7374ce637adee9822072354686 100755 --- a/deploy/deploy-proxy.sh +++ b/deploy/deploy-proxy.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e if [ "$#" -ne 1 ]; then @@ -11,7 +11,7 @@ INVENTORY_PATH=$1 ORG=sunbird # Getting versions -source variable.env +source version.env # Bootstrap swarm echo "@@@@@@@@@ Bootstrap swarm" diff --git a/deploy/sunbird_install.sh b/deploy/sunbird_install.sh index 2b484007bcc58971b9c2c9285181674e7ca21d2e..f2e9a37ffa100ce4864c4f195568cc2293db5fb6 100755 --- a/deploy/sunbird_install.sh +++ b/deploy/sunbird_install.sh @@ -22,6 +22,9 @@ if [[ ! -z ${1:-} ]] && [[ ${1} != -* ]]; then exit 1 fi +# Sourcing versions of images +source version.env + # Reading environment and implementation name implementation_name=$(awk '/implementation_name: /{ if ($2 !~ /#.*/) {print $2}}' config) env_name=$(awk '/env: /{ if ($2 !~ /#.*/) {print $2}}' config) diff --git a/deploy/version.env b/deploy/version.env index 3a0311ada1731fb06719b4f069869bb613051630..4d9e506739bfb4c0e151addcdf15a652e6f22ba6 100644 --- a/deploy/version.env +++ b/deploy/version.env @@ -4,3 +4,4 @@ CONTENT_SERVICE_VERSION=1.6.0-gold LEARNER_SERVICE_VERSION=1.6.0-gold PROXY_VERSION=1.6.0-gold BADGER_SERVICE_VERSION=1.6.0-gold +KONG_VERSION=1.6.0-gold