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 a7dc30cfaedce168fab2ac3ec2d70d3e70bf297b..73f1e2dc46c12db55efc3e2aa81a7eec8ed63d8f 100755 (executable)
--- 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 fa91b048693b550b5266c54f250615b96686429b..8488ed8cab2a5340ec589ab63cc99de48c1263a8 100644 (file)
--- 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