Skip to content

Commit

Permalink
Changed mapd parameter order
Browse files Browse the repository at this point in the history
  • Loading branch information
xmnlab committed May 31, 2018
1 parent 5927f25 commit 58ec950
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ci/build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash -e

docker-compose rm --force --stop
docker-compose up -d --no-build postgres mysql clickhouse impala mapd
docker-compose up -d --no-build mapd postgres mysql clickhouse impala
docker-compose run --rm waiter
docker-compose build --pull ibis
docker-compose run --rm ibis ci/load-data.sh
8 changes: 4 additions & 4 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ services:
- 9000:9000

mapd:
image: mapd/mapd-ce-cpu
image: mapd/mapd-ce-cpu:v3.6.0
ports:
- 9090:9090
- 9091:9091
- "9091-9092:9091-9092"
environment:
- MAPD_HOST=mapd
- MAPD_PORT=9091
Expand All @@ -65,7 +64,8 @@ services:
waiter:
image: jwilder/dockerize
command: |
dockerize -wait tcp://mysql:3306
dockerize -wait tcp://mapd:9091
-wait tcp://mysql:3306
-wait tcp://postgres:5432
-wait tcp://impala:21050
-wait tcp://impala:50070
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-dev-3.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
- plumbum
- psycopg2
- pyarrow>=0.6.0
- pymapd
- pymapd>=0.3.2
- pymysql
- pytest
- pytest-xdist
Expand Down

0 comments on commit 58ec950

Please sign in to comment.