@leverege/build-tools 2.4.3 → 2.4.5

package/lib/web/packleate/Packleator.js

@@ -80,7 +80,7 @@ var Packleator = /*#__PURE__*/function () {
 
     var args = options.args;
     this.privatePackages = new Set();
-    this.args = args ? _objectSpread({}, args, {
+    this.args = args ? _objectSpread(_objectSpread({}, args), {}, {
       output: args.output.substr(-1) === '/' ? args.output.substr(0, args.output.length) : args.output
     }) : {}; // args || {}
 

package/lib/web/packleate/index.js

@@ -125,7 +125,7 @@ function _main() {
             break;
 
           case 4:
-            packleator = new Packleator(_objectSpread({}, defaultConfig, {
+            packleator = new Packleator(_objectSpread(_objectSpread({}, defaultConfig), {}, {
               args: args
             }));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {

package/src/dockreate

@@ -4,6 +4,9 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
+# Global Vars
+pluginFile="Dockerfile.plugin"
+
 # cleanup trapper for gracefully killing, which doesn't do much right now
 cleanup() {
   printf "\nCleaning up and exiting...\n\n"
@@ -50,7 +53,7 @@ create_Dockerfile() {
   local nodeimg="${2:-erbium-alpine}"
   local apkadds="${3}"
   echo "Creating the Dockerfile for node ${nodeimg}"
-  cat<<EODOCKER > Dockerfile
+  cat<<DOCKERBLD > Dockerfile
 # Version ${regvers} @ `date`
 #
 # The FROM directive sets the Base Image for subsequent instructions
@@ -86,6 +89,16 @@ RUN apk update && \
     apk add --no-cache tini bash vim ${apkadds} && \
     rm /bin/sh && ln -s /bin/bash /bin/sh && \
     mkdir -p /usr/src/app /tmp/levlog
+DOCKERBLD
+
+  if [ -f "${pluginFile}" ];
+  then
+    printf "\n# ${pluginFile} BEGIN\n" >> Dockerfile
+    cat $pluginFile >> Dockerfile
+    printf "# ${pluginFile} END\n\n" >> Dockerfile
+  fi
+
+  cat<<EODOCKER >> Dockerfile
 ENTRYPOINT [ "/sbin/tini", "--" ]
 WORKDIR /usr/src/app
  
@@ -200,7 +213,21 @@ runuser=$(strip_undefined "`node -p \"require('../package.json').leverege.runuse
 container="`node -p \"require('../package.json').leverege.container\"`"
 if [ "$container" == "undefined" ];
 then
-  container=$(basename `git config --get remote.origin.url` .git)
+  gitremote=`git config --get remote.origin.url`
+  if [ -z $gitremote ];
+  then
+  cat<<NOCONTAINER
+
+  $(colorize 'red' '***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.
+
+NOCONTAINER
+  exit 1
+  fi
+  container=$(basename $gitremote .git)
 fi
 gcimage=gcr.io/$project/$container
 
@@ -264,12 +291,16 @@ else
   tagstat=$(colorize 'red' 'BETA RELEASE WILL NOT BE TAGGED')
 fi
 
+pluggedIn=$(colorize 'green' "no")
+[ -f "${pluginFile}" ] && pluggedIn=$(colorize 'yellow' "YES")
+
 cat<<IMGINFO
 
   Project:   $(colorize 'green'  "$project")
   Container: $(colorize 'green'  "$container")
   NodeImage: $(colorize 'green'  "$nodeimg")
   AddedPkgs: $(colorize 'green'  "$apkadds")
+  PluggedIn: ${pluggedIn}
   Version:   $(colorize 'green'  "$version")  $tagstat
   Run User:  $(colorize 'green'  "$runuser")
   Previous:  $(colorize 'yellow' "$previous")

package/src/husky-run

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+printf "\n***** Running Husky Pre-Checks *****\n\n"
+
+sleep 3
+exit 1