diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-04-13 12:26:33 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-04-13 12:26:33 +0000 |
| commit | a0d7a3ff61358e73178cf7e14f5a0ecac5291d7f (patch) | |
| tree | 1d8dd3f26f9b6c9ef1d85ad5d9a7ecb8d5c1ceca /xenial-amd64-tcwg-base | |
| parent | 3f87d0a8f5b56eb260e042486f5123ce2aef47da (diff) | |
xenial-amd64-tcwg-x2go: Use build.sh from tcwg-base/tcwg-dev/
Change-Id: Ieb8061ee8607875e9c616177b06fc95514618c4b
Diffstat (limited to 'xenial-amd64-tcwg-base')
| l---------[-rwxr-xr-x] | xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh index 13cf37b5..a36ea167 100755..120000 --- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh +++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh @@ -1,26 +1 @@ -#!/bin/sh -set -e - -trap cleanup_exit INT TERM EXIT - -cleanup_exit() -{ - rm -f start.sh run.sh -} - -export LANG=C -distro=$(basename ${PWD} | cut -f1 -d '-') -arch=$(basename ${PWD} | cut -f2 -d '-') -name=$(basename ${PWD} | cut -f3- -d '-') -image=linaro/ci-${arch}-${name}-ubuntu:${distro} - -cat ../../../xenial-amd64-tcwg-dev/start.sh.tmpl \ - | sed -e "s#@IMAGE@#$image#g" \ - -e "s#@DISTRO@#$distro#g" > start.sh -chmod +x start.sh -cp ../../../xenial-amd64-tcwg-dev/run.sh.tmpl run.sh - -(cd ..; ./build.sh) -docker pull $image 2>/dev/null || true -docker build --tag=$image . -echo $image > .docker-tag +../../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file |