From d9b106f50c60be859a2750045a633baf08858e5d Mon Sep 17 00:00:00 2001
From: Bret Comnes <bcomnes@gmail.com>
Date: Thu, 4 Apr 2019 16:53:56 -0700
Subject: [PATCH] Add zip-it-and-ship-it

---
 Dockerfile             | 27 +++++++++++++++++++++++----
 run-build-functions.sh |  4 +---
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 802a9735..3575d20e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -308,18 +308,37 @@ USER root
 
 ################################################################################
 #
-# Hugo
+# Binrc
 #
 ################################################################################
 
-ENV BINRC_VERSION 0.2.6
+ENV BINRC_VERSION 0.2.9
 
 RUN mkdir /opt/binrc && cd /opt/binrc && \
     curl -sL https://github.com/netlify/binrc/releases/download/v${BINRC_VERSION}/binrc_${BINRC_VERSION}_Linux-64bit.tar.gz | tar zxvf - && \
     ln -s /opt/binrc/binrc_${BINRC_VERSION}_linux_amd64/binrc_${BINRC_VERSION}_linux_amd64 /usr/local/bin/binrc
 
-RUN binrc install gohugoio/hugo 0.54.0 -c /opt/buildhome/.binrc | xargs -n 1 -I{} ln -s {} /usr/local/bin/hugo_0.54.0 && \
-    ln -s /usr/local/bin/hugo_0.54.0 /usr/local/bin/hugo
+################################################################################
+#
+# Hugo
+#
+################################################################################
+
+ENV HUGO_VERSION 0.54.0
+
+RUN binrc install gohugoio/hugo ${HUGO_VERSION} -c /opt/buildhome/.binrc | xargs -n 1 -I{} ln -s {} /usr/local/bin/hugo_${HUGO_VERSION} && \
+    ln -s /usr/local/bin/hugo_${HUGO_VERSION} /usr/local/bin/hugo
+
+################################################################################
+#
+# Zip-it-and-ship-it
+#
+################################################################################
+
+ENV ZIP_IT_AND_SHIP_IT_VERSION 0.2.4
+
+RUN binrc install netlify/zip-it-and-ship-it ${ZIP_IT_AND_SHIP_IT_VERSION} -c /opt/buildhome/.binrc | xargs -n 1 -I{} ln -s {} /usr/local/bin/zip-it-and-ship-it_${ZIP_IT_AND_SHIP_IT_VERSION} && \
+    ln -s /usr/local/bin/zip-it-and-ship-it_${ZIP_IT_AND_SHIP_IT_VERSION} /usr/local/bin/zip-it-and-ship-it
 
 ################################################################################
 #
diff --git a/run-build-functions.sh b/run-build-functions.sh
index 0a1a787c..18f02b9f 100755
--- a/run-build-functions.sh
+++ b/run-build-functions.sh
@@ -525,6 +525,7 @@ install_dependencies() {
 # Take things installed during the build and cache them
 #
 cache_artifacts() {
+  echo "Caching artifacts"
   cache_cwd_directory ".bundle" "ruby gems"
   cache_cwd_directory "bower_components" "bower components"
   cache_cwd_directory "node_modules" "node modules"
@@ -647,9 +648,6 @@ report_lingering_procs() {
 }
 
 after_build_steps() {
-  echo "Caching artifacts"
-  cache_artifacts
-
   # Find lingering processes after the build finished and report it to the user
   report_lingering_procs
 }