LOC: scoped

Author: TimNN

src/ci/docker/run.sh

@@ -18,16 +18,17 @@ docker_dir="`dirname $script`"
 ci_dir="`dirname $docker_dir`"
 src_dir="`dirname $ci_dir`"
 root_dir="`dirname $src_dir`"
+tag=rust-ci-$image
 
 source "$ci_dir/shared.sh"
 
-retry docker \
+docker \
   build \
   --rm \
-  -t rust-ci \
+  -t $tag \
   "`dirname "$script"`/$image"
 
-objdir=$root_dir/obj
+objdir=$root_dir/obj/$image
 
 mkdir -p $HOME/.cargo
 mkdir -p $objdir/tmp
@@ -60,5 +61,5 @@ exec docker \
   --volume "$HOME/rustsrc:$HOME/rustsrc" \
   --privileged \
   --rm \
-  rust-ci \
+  $tag \
   /checkout/src/ci/run.sh

src/ci/run.sh

@@ -9,7 +9,13 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-set -e
+set -eE
+
+function err(){
+  sleep infinity
+}
+
+trap "err" ERR
 
 if [ "$NO_CHANGE_USER" = "" ]; then
   if [ "$LOCAL_USER_ID" != "" ]; then