From 4ef8efcc0fd2eb38903fd2baf742f6f23f5d908f Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Fri, 25 May 2018 13:11:01 +0530
Subject: [PATCH] Issue #155 fix: Updated the release versions
---
.../roles/stack-api-manager/templates/stack-api-manager.yml | 2 +-
deploy/deploy-apis.sh | 4 +++-
deploy/deploy-core.sh | 2 +-
deploy/deploy-proxy.sh | 4 ++--
deploy/sunbird_install.sh | 3 +++
deploy/version.env | 1 +
6 files changed, 11 insertions(+), 5 deletions(-)
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 d98d3eebf..506ba864c 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 d9a4e7501..072ae5166 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 06c9fbdd2..c46876252 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 e93fe25bc..c19dd5f7a 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 2b484007b..f2e9a37ff 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 3a0311ada..4d9e50673 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
--
GitLab