Tweaks for cf push and vendor cache

Author: nwmac

.cfignore

@@ -7,7 +7,7 @@ out/
 outputs/
 tmp/
 tools/
-CHANGELOG.md
+*.md
 test/
 deploy/all-in-one/
 deploy/ci/
@@ -20,4 +20,3 @@ deploy/stratos-ui-release/
 deploy/uaa/
 docs/
 build/dev_config.json
-vendor/

build/bk-build.sh

@@ -23,8 +23,11 @@ STRATOS_GOBASE=tmp/go/src/github.com/cloudfoundry-incubator/stratos
 mkdir -p ${STRATOS_GOBASE}/src
 
 # Remove the temporary source folder if it is already there
-if [ -d "${STRATOS_GOBASE}/src/jetstream" ]; then
-  rm -rf ${STRATOS_GOBASE}/src/jetstream
+rm -rf ${STRATOS_GOBASE}/src/jetstream
+
+# Copy vendor folder if needed
+if [ ! -d "${STRATOS_GOBASE}/vendor" ] && [ -d "${STRATOS}/vendor" ]; then
+  cp -R ${STRATOS}/vendor ${STRATOS_GOBASE} 
 fi
 
 # Set go path
@@ -42,7 +45,7 @@ cp Gopkg.* ${STRATOS_GOBASE}
 pushd ${STRATOS_GOBASE} > /dev/null
 set +e
 echo "Checking backend dependencies ..."
-dep check -skip-lock > /dev/null
+dep check -skip-lock
 DEP_CHECK_RESULT=$?
 set -e
 if [ ${DEP_CHECK_RESULT} -ne 0 ]; then

build/tools/golang-movesrc.sh

@@ -20,6 +20,9 @@ fi
 
 # Assumes you are running from top-level folder
 
+# Remove readme file for plugin - no longer needed
+git rm src/backend/cfapppush/README.md
+
 git mv src/backend src/jetstream
 mkdir src/jetstream/plugins
 git mv src/jetstream/app-core/* src/jetstream
@@ -92,6 +95,3 @@ git rm -rf src/jetstream/__vendor
 
 # Stop ignore of app-core
 sed -i '' '/.*app-core.*/d' .gitignore
-
-# Remove readme file for plugin - no longer needed
-git rm src/jetstream/plugins/cfapppush/README.md

deploy/cloud-foundry/build.sh

@@ -52,8 +52,6 @@ log "Building back-end" $CYAN
 # Copy backend executable here
 cp outputs/portal-proxy .
 
-mkdir -p dist
-
 # Back-end serves static resources from ui folder not dist
 mv dist ui
 
@@ -73,24 +71,9 @@ if [ -d ${VENDOR_FOLDER} ]; then
   cp -R ${VENDOR_FOLDER}/* $CACHE_DIR/go-vendor
 fi
 
-# Remove files and folders not needed for running the app
-rm -rf ./build
-rm -rf ./src
-rm -rf ./vendor
+# Remove transient folders used during build
 rm -rf ./node_modules
 rm -rf ./tmp
-rm -rf angular.json
-rm -rf index.yaml
-rm -rf Gopkg.*
-rm -rf package.json
-rm -rf .??*
-rm -rf *.json
-rm -rf *.js
-rm -rf *.md
-
-# List app contents at the top-level
-log "App folder (top-level)" $CYAN
-ls -al
 
 log "Disk usage for cache and app folders:" $CYAN