Merge pull request #23 from kappnav/useCommonProjectLists

Update scripts to use common project and build lists

branches.sh

@@ -17,7 +17,6 @@
 #*****************************************************************
 # shows all branches
 arg=$1
-projs='README build samples apis controller operator ui' 
 
 # make sure running in build directory 
 if [ $(echo $PWD | awk '{ n=split($0,d,"/"); print d[n] }') != 'build' ]; then 
@@ -36,6 +35,9 @@ if [ x$arg == x'--?' ]; then
 	exit 1
 fi
 
+. ./projectList.sh
+projs=$ALL_PROJECTS
+
 for p in $projs; do 
 	if [ -d ../$p ]; then
 		cd ../$p

build.sh

@@ -37,7 +37,8 @@ fi
 
 # determine if building all projects or just one
 if [ x$proj == x ]; then
-    projs='apis controller operator ui'
+    . ./projectList.sh
+    projs=$BUILD_PROJECTS
 else
     projs=$proj
 fi

checkout.sh

@@ -17,10 +17,8 @@
 #*****************************************************************
 # does check out of specified branch across all kappnav projects 
 branch=$1
-
-projs='README build samples apis controller operator ui' 
-
 arg=$branch
+
 # make sure running in build directory 
 if [ $(echo $PWD | awk '{ n=split($0,d,"/"); print d[n] }') != 'build' ]; then 
     echo 'Error: $kappnav/build dir must be current dir.'
@@ -37,6 +35,9 @@ if [ x$arg == x'--?' ] || [ x$arg == 'x' ]; then
 	exit 0
 fi 
 
+. ./projectList.sh
+projs=$ALL_PROJECTS
+
 # build projects
 for p in $projs; do 
 	if [ -d ../$p ]; then 

clone.sh

@@ -17,7 +17,6 @@
 #*****************************************************************
 # clone all development directories except website
 arg=$1 
-projs='README build samples apis controller operator ui' 
 
 # make sure running in build directory 
 if [ $(echo $PWD | awk '{ n=split($0,d,"/"); print d[n] }') != 'build' ]; then 
@@ -35,6 +34,9 @@ if [ x$arg == x'--?' ]; then
     exit 0
 fi
 
+. ./projectList.sh
+projs=$ALL_PROJECTS
+
 # clone all projects 
 for p in $projs; do 
     git clone https://github.com/kappnav/$p.git ../$p 

projectList.sh

@@ -17,5 +17,6 @@
 #*****************************************************************
 # Defines the list of kAppNav projects for use by other scripts
 
-BUILD_PROJECTS='apis controller inv operator ui'
-ALL_PROJECTS=$BUILD_PROJECTS' README build samples kappnav-website'
+BUILD_PROJECTS='apis controller inventory operator ui'
+ALL_PROJECTS=$BUILD_PROJECTS' README build samples kappnav-website'
+IMAGES='apis controller inv operator ui'

pull.sh

@@ -36,7 +36,8 @@ if [ x$arg == x'--?' ]; then
 	exit 1
 fi
 
-projs='README samples apis controller operator ui build' 
+. ./projectList.sh
+projs=$ALL_PROJECTS
 
 for p in $projs; do 
     if [ -d ../$p ]; then

pushKAppNavToDockerHub.sh

@@ -36,7 +36,8 @@ if [ x$1 == x'--?' ] || [ x$1 == x'-?' ]; then
 fi
 
 if [ x$image == x ]; then
-	imagelist="inv apis controller operator ui"
+    . ./projectList.sh
+	imagelist=$IMAGES
 else
 	imagelist=$image
 fi

pushimages.sh

@@ -46,14 +46,15 @@ fi
 docker login
 
 if [ x$image == x ]; then
-	imagelist="kappnav-inv kappnav-ui kappnav-apis kappnav-controller kappnav-operator" 
+	. ./projectList.sh
+	imagelist=$IMAGES
 else
-	imagelist="kappnav-"$image
+	imagelist=$image
 fi
 tag=latest
 for image in $imagelist; do
-   echo docker tag $image:$tag $org/$image:$tag
-   docker tag $image:$tag $org/$image:$tag
-   echo docker push $org/$image:$tag
-   docker push $org/$image:$tag
+   echo docker tag kappnav-$image:$tag $org/kappnav-$image:$tag
+   docker tag kappnav-$image:$tag $org/kappnav-$image:$tag
+   echo docker push $org/kappnav-$image:$tag
+   docker push $org/kappnav-$image:$tag
 done

status.sh

@@ -36,7 +36,8 @@ if [ x$arg == x'--?' ]; then
 	exit 1
 fi
 
-projs='README build samples apis controller operator ui' 
+. ./projectList.sh
+projs=$ALL_PROJECTS
 
 for p in $projs; do
     if [ -d ../$p ]; then