From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 28 Dec 2016 15:29:30 +0000 (-0500)
Subject: Arvbox common.sh script won't fail if bundler gem not cached on disk.
X-Git-Tag: 1.1.0~514
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1e19bc12a83dacf4a40d1c0d358aae48b6588a58?hp=b27f1106beb0fb321ee123501afb5ccf2354a363

Arvbox common.sh script won't fail if bundler gem not cached on disk.
Don't push docker images if build fails.  no issue #
---

diff --git a/build/run-build-docker-images.sh b/build/run-build-docker-images.sh
index a7dc30cfae..73f1e2dc46 100755
--- a/build/run-build-docker-images.sh
+++ b/build/run-build-docker-images.sh
@@ -148,7 +148,7 @@ title "uploading images"
 
 timer_reset
 
-if [[ "$ECODE" != "0" ]]; then
+if [[ "$EXITCODE" != "0" ]]; then
     title "upload arvados images SKIPPED because build failed"
 else
     if [[ $upload == true ]]; then
diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index fa91b04869..8488ed8cab 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -40,7 +40,7 @@ run_bundler() {
         frozen=""
     fi
     if ! test -x bundle ; then
-        bundlergem=$(ls -r $GEM_HOME/cache/bundler-*.gem 2>/dev/null | head -n1)
+        bundlergem=$(ls -r $GEM_HOME/cache/bundler-*.gem 2>/dev/null | head -n1 || true)
         if test -n "$bundlergem" ; then
             flock /var/lib/gems/gems.lock gem install --local --no-document $bundlergem
         else