From 5596aa1f65580af279b27569fbddac292cbcc2a6 Mon Sep 17 00:00:00 2001
From: Shrenik <shrenik.jain@research.iiit.ac.in>
Date: Wed, 31 May 2017 00:38:55 +0530
Subject: Adding CORS Adds flask-cors module so that SwaggerUI can examine
content from a different container JIRA: STORPERF-129
Change-Id: I9c47a2ea464da83910c368d771dce13f5364ca23
Signed-off-by: Shrenik <shrenik.jain@research.iiit.ac.in>
---
ci/launch_docker_container.sh | 7 ++++++-
ci/verify.sh | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
(limited to 'ci')
diff --git a/ci/launch_docker_container.sh b/ci/launch_docker_container.sh
index b119946..ec9c4d8 100755
--- a/ci/launch_docker_container.sh
+++ b/ci/launch_docker_container.sh
@@ -29,7 +29,12 @@ then
sudo chown 33:33 job/carbon
fi
-docker pull opnfv/storperf:latest
+if [ -z $DOCKER_TAG ]
+then
+ DOCKER_TAG=latest
+fi
+
+docker pull opnfv/storperf:$DOCKER_TAG
docker run -d --env-file `pwd`/job/admin.rc \
-p 5000:5000 \
diff --git a/ci/verify.sh b/ci/verify.sh
index 84dc603..28d0886 100755
--- a/ci/verify.sh
+++ b/ci/verify.sh
@@ -23,6 +23,7 @@ pip install autoflake==0.6.6
pip install autopep8==1.2.2
pip install coverage==4.1
pip install flask==0.10
+pip install flask_cors==3.0.2
pip install flask-restful==0.3.5
pip install flask-restful-swagger==0.19
pip install flask-swagger==0.2.12
--
cgit