travis-run-local: add architecture prefix to image

Oops, I forgot that on Travis these are running natively on the
architectures in question, so the architecture prefix isn't needed
there. It is locally, though.

Signed-off-by: Steven Noonan <[email protected]>

Author: Steven Noonan

.travis-run-local.py

@@ -20,6 +20,10 @@ def env_parse(env, arch=None):
     kv = { k: v for k, v in [ s.split('=') for s in kv_str ] }
 
     # Ugly trick to prepare for running commands for this image
+    try:
+        del os.environ['IMAGE_PREFIX']
+    except KeyError:
+        pass
     os.environ.update(kv)
 
     if 'IMAGE' not in kv or 'IMAGE_TAG' not in kv:
@@ -29,7 +33,9 @@ def env_parse(env, arch=None):
     image = '%s:%s' % (kv['IMAGE'], kv['IMAGE_TAG'])
 
     if arch is not None:
-        return docker_arch(arch) + '/' + image
+        image_prefix = docker_arch(arch) + '/'
+        os.environ['IMAGE_PREFIX'] = image_prefix
+        return image_prefix + image
 
     return image
 

.travis.yml

@@ -31,7 +31,7 @@ jobs:
       env: IMAGE=ubuntu IMAGE_TAG=rolling
 
 before_install:
-  - docker run -d --rm --cap-add SYS_PTRACE --name $CONTAINER_NAME -e LC_ALL="C" -e LANG="C" -v $(pwd):/travis -w /travis $IMAGE:$IMAGE_TAG tail -f /dev/null
+  - docker run -d --rm --cap-add SYS_PTRACE --name $CONTAINER_NAME -e LC_ALL="C" -e LANG="C" -v $(pwd):/travis -w /travis $IMAGE_PREFIX$IMAGE:$IMAGE_TAG tail -f /dev/null
   - docker ps
   - docker exec -e TRAVIS_BUILD=1 -e IMAGE=$IMAGE -e IMAGE_TAG=$IMAGE_TAG -t $CONTAINER_NAME sh .travis/preinstall.sh