summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-27 00:01:15 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-27 00:01:15 +0300
commitf57dfa419bf83a6b6fad7fd4eebb4cbe460593a7 (patch)
tree8155f84b4e2f419ae379e5957e9c386e9426b016
parent6ecc6b87f52f3ae4f941a9e5b5a2ea854ebcf379 (diff)
downloadmv-f57dfa419bf83a6b6fad7fd4eebb4cbe460593a7.tar.gz
mv-f57dfa419bf83a6b6fad7fd4eebb4cbe460593a7.tar.bz2
mv-f57dfa419bf83a6b6fad7fd4eebb4cbe460593a7.tar.xz
mv-f57dfa419bf83a6b6fad7fd4eebb4cbe460593a7.zip
Move docker scripts into separate files. Rename scripts from travis* to docker*.
-rw-r--r--.travis.yml8
-rwxr-xr-xtools/ci/scripts/docker_incontainer.sh (renamed from tools/ci/scripts/travis.docker.sh)0
-rwxr-xr-xtools/ci/scripts/docker_run.sh9
3 files changed, 10 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 13e29de1d..a378f2280 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,14 +12,8 @@ before_script:
- sudo apt-get install docker
script:
- - docker pull ${IMAGE}
- travis_wait 50 sleep infinity &
- - docker run
- --volume=$(pwd):/build:rw
- -e PACKAGES="${PACKAGES}"
- -e COMMAND="${COMMAND}"
- ${IMAGE}
- /bin/sh -x -c "cd /build; pwd; ./tools/ci/scripts/travis.docker.sh"
+ - ./tools/ci/scripts/docker_run.sh
- docker ps -a
env:
diff --git a/tools/ci/scripts/travis.docker.sh b/tools/ci/scripts/docker_incontainer.sh
index 55568aa05..55568aa05 100755
--- a/tools/ci/scripts/travis.docker.sh
+++ b/tools/ci/scripts/docker_incontainer.sh
diff --git a/tools/ci/scripts/docker_run.sh b/tools/ci/scripts/docker_run.sh
new file mode 100755
index 000000000..8a3add42b
--- /dev/null
+++ b/tools/ci/scripts/docker_run.sh
@@ -0,0 +1,9 @@
+#!/bin/bash -x
+
+docker pull ${IMAGE}
+docker run \
+ --volume=$(pwd):/build:rw \
+ -e PACKAGES="${PACKAGES}" \
+ -e COMMAND="${COMMAND}" \
+ ${IMAGE} \
+ /bin/sh -x -c "cd /build; pwd; ./tools/ci/scripts/docker_incontainer.sh"