@leverege/build-tools 2.18.0-beta.10 → 2.18.0-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.18.0-beta.10",
+  "version": "2.18.0-beta.12",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/decrypt-secrets

@@ -5,7 +5,6 @@ display_usage() {
 } 
 
 install_gcloud() {
-  uname -a
   install () {
     # Set sudo to work whether logged in as root user or non-root user
     if [[ $EUID == 0 ]]; then export SUDO=""; else export SUDO="sudo"; fi
@@ -57,13 +56,14 @@ initialize_gcloud() {
   gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
 }
 
-function decryptEnvToPipeline() {
-  printf "______________BitBucket Pipeline Detected______________\n"
+# If this is running from a BitBucket Pipeline then it is assumed that our
+# custom image from the pipeline-image is executing which already has the
+# Google SDK + gcloud installed - so just use it.
+if [ "$BITBUCKETCI" == "true" ];
+then
   printf "  GCLOUD_PROJECT      [$GCLOUD_PROJECT]\n"
   printf "  GCLOUD_COMPUTE_ZONE [$GCLOUD_COMPUTE_ZONE]\n"
 
-  install_gcloud
-
   gcloud --quiet config set project ${GCLOUD_PROJECT}
   gcloud --quiet config set compute/zone ${GCLOUD_COMPUTE_ZONE}
   echo ${GCLOUD_SERVICE_KEY} | gcloud auth activate-service-account --key-file=-
@@ -77,28 +77,33 @@ function decryptEnvToPipeline() {
     --plaintext-file .env \
     --ciphertext-file .env.enc
 
-  exit $?
-}
+  if [ -f "secrets.tar.gz.enc" ]; then
+    # decrypt the secrets.tar.gz.enc
+    gcloud kms decrypt \
+      --project $GCLOUD_PROJECT \
+      --key circle-ci \
+      --keyring build-tools \
+      --location $GCLOUD_COMPUTE_ZONE \
+      --plaintext-file secrets.tar.gz \
+      --ciphertext-file secrets.tar.gz.enc
+
+    # untar secrets.tar.gz
+    tar xvzf secrets.tar.gz
+  fi
+
+  exit 0 # may want to improve error report/handling
+fi
 
 if [ "$1" == "-h" ]; then
   display_usage
   exit 1
 fi
 
-printf "\nBITBUCKETCI=[$BITBUCKETCI] CIRCLECI=[$CIRCLECI]\n"
-
-if [ "$BITBUCKETCI" == "true" ];
-then
-  decryptEnvToPipeline
-fi
-
 if [ "$CIRCLECI" == "true" ]; then
   install_gcloud
   initialize_gcloud
 fi
 
-printf "\nXXXXXXXXXX SHOULD NOT BE HERE XXXXXXXXXX\n" && exit 0 # XXX
-
 git_origin=`git config --get remote.origin.url`
 
 if [[ $git_origin = https* ]]; then

package/src/dockreate

@@ -402,7 +402,7 @@ BUILDERR
 fi
 
 # Tag the container with the node detailsand the culprit.
-gcloud container images add-tag --quiet $gcimage:$version $gcimage:$pckgdts-$nodeimg-$USER
+gcloud container images add-tag --quiet $gcimage:$version $gcimage:$pckgdts-$nodeimg-$USER $gcimage:latest
 if [ ! -z "$artifact" ];
 then
   cat<<END_ARTY