aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap/vagrant-onap/lib')
-rwxr-xr-xbootstrap/vagrant-onap/lib/vid51
1 files changed, 26 insertions, 25 deletions
diff --git a/bootstrap/vagrant-onap/lib/vid b/bootstrap/vagrant-onap/lib/vid
index 902c45540..fc622c3c2 100755
--- a/bootstrap/vagrant-onap/lib/vid
+++ b/bootstrap/vagrant-onap/lib/vid
@@ -3,47 +3,42 @@
set -o xtrace
source /var/onap/functions
-source /var/onap/asserts
-src_folder=/opt/vid
-
-# pull_mariadb_image() - Pull MariaDB container image from a Docker Registry Hub
-function pull_mariadb_image {
- docker_openecomp_login
- docker pull $nexus_docker_repo/library/mariadb:10
-}
+vid_src_folder=$git_src_folder/vid
# clone_all_vid_repos() - Function that clones VID source code.
function clone_all_vid_repos {
- clone_repo vid $src_folder
- clone_repo vid/asdcclient $src_folder/asdcclient
+ clone_repo vid $vid_src_folder
+ clone_repo vid/asdcclient $vid_src_folder/asdcclient
}
# compile_all_vid_repos() - Function that compiles VID source repo.
function compile_all_vid_repos {
- compile_src $src_folder
- compile_src $src_folder/asdcclient
+ compile_src $vid_src_folder/asdcclient
+ compile_src $vid_src_folder
}
-# install_vid() - Download and configure Vid source code
-function install_vid {
- local vid_image=openecomp/vid
-
- clone_all_vid_repos
- if [[ "$compile_repo" == "True" ]]; then
- compile_all_vid_repos
+# _build_vid_images() - Function that builds VID docker images
+function _build_vid_images {
+ if [[ "$compile_repo" != "True" ]]; then
+ compile_src $vid_src_folder
fi
+ build_docker_image $vid_src_folder/deliveries
+}
+# get_vid_images() - Function that retrieves VID docker images
+function get_vid_images {
if [[ "$build_image" == "True" ]]; then
- compile_src $src_folder
- build_docker_image $src_folder/deliveries
- asserts_image $vid_image
- vid_image=`docker images | grep vid | grep latest| awk '{print $1 ":" $2}'`
+ _build_vid_images
else
pull_openecomp_image vid
- vid_image=$nexus_docker_repo/$vid_image:$docker_version
fi
- pull_mariadb_image
+ pull_docker_image mariadb:10
+}
+
+# install_vid() - Download and configure Vid source code
+function install_vid {
+ vid_image=`docker images | grep vid | grep latest| awk '{print $1 ":" $2}'`
docker rm -f vid-mariadb
docker rm -f vid-server
@@ -54,5 +49,11 @@ function install_vid {
# init_vid() - Function that initialize Vid services
function init_vid {
+ clone_all_vid_repos
+ if [[ "$compile_repo" == "True" ]]; then
+ compile_all_vid_repos
+ fi
+
+ get_vid_images
install_vid
}