@leverege/build-tools 2.12.0-john.3 → 2.12.0-john.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.12.0-john.3",
+  "version": "2.12.0-john.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
     "repository": {

package/src/dockreate

@@ -7,6 +7,7 @@ fi
 # Load common bash functions
 . `build-tools --bashfun`
 GITTOP=`git rev-parse --show-toplevel`
+cd $GITTOP/docker
 
 if [ ! -x "$(command -v jq)" ];
 then
@@ -18,6 +19,16 @@ NO_JQ
  exit 1
 fi
 
+if [ ! -d "$GITTOP/dist" ];
+then
+  cat<<NO_DIST
+
+  `color r "***ERROR: Missing the dist directory, run this first => "``color g 'npm run build'`
+
+NO_DIST
+  exit 1
+fi
+
 function packageJson() {
   result=$(jq -r $1 $GITTOP/package.json)
   [ "$result" != "null" ] && echo $result
@@ -34,25 +45,6 @@ cleanup() {
 }
 trap cleanup INT
 
-# Usage: colorize <color> <string>
-# where: color  = [red|green|yellow]
-#        string = the thing to apply the color to
-colorize() {
-  local C_green='\e[92m'
-  local C_yellow='\e[93m'
-  local C_red='\e[91m'
-  local C_off='\e[0m'
-
-  case "$1" in
-    'red'   ) clr="$C_red" ;;
-    'green' ) clr="$C_green" ;;
-    'yellow') clr="$C_yellow" ;;
-           *) clr=$C_off;;
-  esac
-
-  printf "$clr$2$C_off"
-}
-
 strip_undefined() {
   local result="$1"
   [ "$1" == "undefined" ] && result=""
@@ -180,13 +172,13 @@ if [ ! -f "$NPMRC" ];
 then
   cat<<ROTOKEN
 
-  $(colorize 'red' '***ERROR: expecting to see a readonly npmjs token')
+  $(color r '***ERROR: expecting to see a readonly npmjs token')
 
   For security purposes, we deploy images with read-only npmjs tokens.
   These may be acquired from another developer, or can be created with the
   npmjs leverege account.
   
-  Obtain the token and drop it here => $(colorize 'green' "$NPMRC")
+  Obtain the token and drop it here => $(color g "$NPMRC")
 
 
 ROTOKEN
@@ -199,7 +191,7 @@ if [ "$project" == "" ];
 then
   cat<<NOPROJ
 
-  $(colorize 'red' '***ERROR: package.json missing a leverege project statement')
+  $(color r '***ERROR: package.json missing a leverege project statement')
 
   The package.json file must contain a project setting in the leverege
   namespace stating which GCP project the docker images are written to. It
@@ -234,11 +226,11 @@ then
   then
   cat<<NOCONTAINER
 
-  $(colorize 'red' '***ERROR: attempting to build an unnamed container')
+  $(color r '***ERROR: attempting to build an unnamed container')
 
   You are attempting to create a docker image without a container name or
-  a git remote setup. Either define a $(colorize 'yellow' 'container') statement in the leverege
-  section of package.json, or add a $(colorize 'green' 'git remote') to this repository.
+  a git remote setup. Either define a $(color y 'container') statement in the leverege
+  section of package.json, or add a $(color g 'git remote') to this repository.
 
 NOCONTAINER
   exit 1
@@ -260,7 +252,7 @@ then
   if [[ `git status --porcelain` ]]; then
     cat<<DIRTAG
 
-  $(colorize 'red' '***ERROR: attempting to tag a non-beta dirty git repository')
+  $(color r '***ERROR: attempting to tag a non-beta dirty git repository')
 
   You are attempting to create a tagged release image for pushing to the
   container registry, but there are locally modified files. This is not
@@ -269,9 +261,9 @@ then
 
   Available options for proceeding:
 
-    $(colorize 'green' '1) cleanly commit all local mods assuming relevance')
-    $(colorize 'yellow' '2) eliminate unwanted local modifications')
-    $(colorize 'red' '3) stash anything that is irrelevant to this release')
+    $(color g '1) cleanly commit all local mods assuming relevance')
+    $(color y '2) eliminate unwanted local modifications')
+    $(color r '3) stash anything that is irrelevant to this release')
 
 
 DIRTAG
@@ -286,7 +278,7 @@ DIRTAG
   then
     cat<<NOUPSTR
 
-  $(colorize 'red' '***ERROR: the current branch must have an upstream')
+  $(color r '***ERROR: the current branch must have an upstream')
 
   You are attempting to create a tagged release image for pushing to the
   container registry, but the current branch does not have an upstream to
@@ -295,54 +287,53 @@ DIRTAG
 
   Available options for proceeding:
 
-    $(colorize 'green' '1) set an upstream for this branch via:')
-    $(colorize 'green' "       git push --set-upstream origin ${branch}")
+    $(color g '1) set an upstream for this branch via:')
+    $(color g "       git push --set-upstream origin ${branch}")
 
-    $(colorize 'yellow' '2) rebase, squash and merge onto a branch with an upstream')
+    $(color y '2) rebase, squash and merge onto a branch with an upstream')
 
 NOUPSTR
     exit 1
   fi
 
-  tagstat=$(colorize 'yellow' 'will be tagged')
+  tagstat=$(color y 'will be tagged')
 else
-  tagstat=$(colorize 'red' 'BETA RELEASE WILL NOT BE TAGGED')
+  tagstat=$(color r 'BETA RELEASE WILL NOT BE TAGGED')
 fi
 
-pluggedIn=$(colorize 'green' "no")
-[ -f "${pluginFile}" ] && pluggedIn=$(colorize 'yellow' "YES")
+pluggedIn=$(color g "no")
+[ -f "${pluginFile}" ] && pluggedIn=$(color y "YES")
 
 cat<<IMGINFO
-  LOCAL LOCAL LOCAL
-  Project:   $(colorize 'green'  "$project")
-  Container: $(colorize 'green'  "$container")
-  NodeImage: $(colorize 'green'  "$nodeimg")
-  NopeOps:   $(colorize 'yellow' "$nodeops")
-  NPM Logs:  $(colorize 'green'  "$npmlogging")
-  AddedPkgs: $(colorize 'green'  "$apkadds")
+  Project:   $(color g $project)
+  Container: $(color g $container)
+  NodeImage: $(color g $nodeimg)
+  NopeOps:   $(color y $nodeops)
+  NPM Logs:  $(color g $npmlogging)
+  AddedPkgs: $(color g $apkadds)
   PluggedIn: ${pluggedIn}
-  Version:   $(colorize 'green'  "$version")  $tagstat
-  Run User:  $(colorize 'green'  "$runuser")
-  Previous:  $(colorize 'yellow' "$previous")
-  DateStamp: $(colorize 'green'  "$pckgdts")
-  GCImage:   $(colorize 'green'  "$gcimage:$version")
-  Registry:  $(colorize 'yellow' "$registry:$version")
+  Version:   $(color g $version)  $tagstat
+  Run User:  $(color g $runuser)
+  Previous:  $(color y $previous)
+  DateStamp: $(color g $pckgdts)
+  GCImage:   $(color g $gcimage:$version)
+  Registry:  $(color y $registry:$version)
 
 IMGINFO
 
 if [ "$pckgver" != "$version" ];
 then
   cat<<EOPKG
-  $(colorize 'yellow' '***WARNING: specified version does not match package.json version' )
-                   package.json => $(colorize 'green' "$pckgver")
-                   specified    => $(colorize 'red'   "$version")
+  $(color y '***WARNING: specified version does not match package.json version' )
+                   package.json => $(color g "$pckgver")
+                   specified    => $(color r   "$version")
 
 EOPKG
   if [ $tagging ];
   then
     cat<<EONOPE
 
-  $(colorize 'red' '... and you are attempting to release so NOPE!' )
+  $(color r '... and you are attempting to release so NOPE!' )
 
 EONOPE
     exit 1
@@ -353,7 +344,7 @@ create_Dockerfile "$version" "$nodeimg" "$apkadds"
 create_bashrc "$version" "$nodeimg"
 
 rm -rf ./workspace && mkdir -p ./workspace
-cp -rfp ../package*json ../dist/* ./workspace
+cp -rfp ${GITTOP}/package*json ${GITTOP}/dist/* ./workspace
  
 # grab the read only npmrc token for the image
 cp -f $NPMRC .npmrc
@@ -386,7 +377,7 @@ then
   bldErr=$?
   cat<<BUILDERR
 
-  $(colorize 'red' '***ERROR: build failed! Aborting without tagging.')
+  $(color r '***ERROR: build failed! Aborting without tagging.')
 
   The gcloud build process seems to have run into a problem. Please fix the
   issue and rerun the dockerize process. This build will not be tagged, nor
@@ -399,18 +390,26 @@ fi
 # Tag the container with the node detailsand the culprit.
 gcloud container images add-tag --quiet $gcimage:$version $gcimage:$pckgdts-$nodeimg-$USER
 if [ "$USE_ARTIFACTORY" == "yes" ];
-  printf "Background send `color y $gcimage:$version` to the artifactory - `color g 'thanks for testing!'`\n\n"
+then
+  cat<<END_ARTY
+
+  Sending `color y $gcimage:$version` to the `color g artifactory`
+  in the background, which may take up to a minute to complete.
+
+  `color g 'Thank you for testing!'`
+
+END_ARTY
   gcloud container images add-tag --quiet $gcimage:$version $registry:$version &
 fi
 
 if [ $tagging ];
 then
-  printf "\n$(colorize 'green' "Tagging and Pushing $version")\n"
+  printf "\n$(color g "Tagging and Pushing $version")\n"
   git tag -af $1 -m "Docker version $1"
   git push --follow-tags
   gcloud container images add-tag --quiet $gcimage:$version $gcimage:latest
 else
-  printf "\n$(colorize 'yellow' '*** Skipped git tagging - beta release')\n\n"
+  printf "\n$(color y '*** Skipped git tagging - beta release')\n\n"
 fi
 
 cleanup