summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-11-28 07:41:33 +0100
committerstartxfr <clarue@startx.fr>2015-11-28 07:41:33 +0100
commit572c7a94dff0f4a87e98b71891cd9abcd4cabe50 (patch)
tree311c61c4c21e446de3724cf8df8ead53878c6fae
parent96716ec932f74a04bc9c8bf52e038f0a2705c654 (diff)
downloadphpmyadmin-572c7a94dff0f4a87e98b71891cd9abcd4cabe50.tar.gz
phpmyadmin-572c7a94dff0f4a87e98b71891cd9abcd4cabe50.tar.bz2
phpmyadmin-572c7a94dff0f4a87e98b71891cd9abcd4cabe50.tar.xz
phpmyadmin-572c7a94dff0f4a87e98b71891cd9abcd4cabe50.zip
adding travis
-rwxr-xr-xrun-tests.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/run-tests.sh b/run-tests.sh
index c8fd72d..0b7cade 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -3,11 +3,10 @@ set -ev
mkdir /tmp/startx-docker-images;
cd /tmp/startx-docker-images;
git clone https://github.com/startxfr/docker-images.git /tmp/startx-docker-images
-sudo docker build -t fedora OS/
-sudo docker run -it --name="fedora" fedora bash
+sudo docker-compose build
sudo docker-compose up -d
sudo docker-compose logs
-exit 1;
+echo $TRAVIS_PULL_REQUEST
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
exit 0;
fi \ No newline at end of file