You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2017/02/19 07:16:02 UTC
incubator-predictionio git commit: [PIO-53] Another attempt to make
this work
Repository: incubator-predictionio
Updated Branches:
refs/heads/ds/docker [created] 6467b9052
[PIO-53] Another attempt to make this work
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/6467b905
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/6467b905
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/6467b905
Branch: refs/heads/ds/docker
Commit: 6467b90525df4e2eb873696d918337d1700ccf8a
Parents: b7d8815
Author: Donald Szeto <do...@apache.org>
Authored: Sat Feb 18 23:15:28 2017 -0800
Committer: Donald Szeto <do...@apache.org>
Committed: Sat Feb 18 23:15:28 2017 -0800
----------------------------------------------------------------------
.travis.yml | 1 +
tests/docker-files/init.sh | 2 +-
tests/docker-files/wait-for-postgres.sh | 5 -----
3 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6467b905/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 22138fc..1e09f84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,6 +53,7 @@ before_install:
- unset SBT_OPTS JVM_OPTS
before_script:
+ - docker-compose -v
- ./tests/before_script.travis.sh
script:
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6467b905/tests/docker-files/init.sh
----------------------------------------------------------------------
diff --git a/tests/docker-files/init.sh b/tests/docker-files/init.sh
index af68f1b..1f8f618 100755
--- a/tests/docker-files/init.sh
+++ b/tests/docker-files/init.sh
@@ -17,6 +17,6 @@
#
set -e
-/wait-for-postgres.sh postgres /bin/true
+/wait-for-postgres.sh postgres
export PYTHONPATH=/$PIO_HOME/tests:$PYTHONPATH
eval $@
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6467b905/tests/docker-files/wait-for-postgres.sh
----------------------------------------------------------------------
diff --git a/tests/docker-files/wait-for-postgres.sh b/tests/docker-files/wait-for-postgres.sh
index 2c7d855..967e5fc 100755
--- a/tests/docker-files/wait-for-postgres.sh
+++ b/tests/docker-files/wait-for-postgres.sh
@@ -18,13 +18,8 @@
set -e
host="$1"
-shift
-cmd="$@"
until psql -h "$host" -U "pio" -c '\l'; do
>&2 echo "Postgres is unavailable - sleeping"
sleep 1
done
-
->&2 echo "Postgres is up - executing command"
-exec $cmd