From f9dcd1f03bad93fc5ef066377032b174e99c86db Mon Sep 17 00:00:00 2001
From: Maxim Sukharev <maxim@sourced.tech>
Date: Wed, 9 May 2018 14:33:36 +0200
Subject: [PATCH] use docker-compose in CI

Signed-off-by: Maxim Sukharev <maxim@sourced.tech>
---
 .travis.yml             | 13 +++++--------
 docker-compose.host.yml |  4 +++-
 docker-compose.yml      | 10 +++-------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7d4107d4..8b7ef83d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
   include:
   - scala: 2.11.2
     before_install:
-    - ./scripts/start_docker_db.sh
+    - docker-compose -f docker-compose.yml -f docker-compose.host.yml up -d scylla
     - tar -xzf src/test/resources/weighted-minhash/csv.tar.gz -C src/test/resources/weighted-minhash/
     script:
       # run only tests without external deps (beside DB)
@@ -25,8 +25,7 @@ matrix:
   - scala: 2.11.2
     env: INTEGRATION_TESTS=true
     before_install:
-      - ./scripts/start_docker_db.sh
-      - ./scripts/start_docker_bblfsh.sh
+      - docker-compose -f docker-compose.yml -f docker-compose.host.yml up -d scylla bblfshd
       - ./scripts/install_python.sh
       - tar -xzf src/test/resources/weighted-minhash/csv.tar.gz -C src/test/resources/weighted-minhash/
     script:
@@ -60,8 +59,7 @@ matrix:
       - MASTER=spark://127.0.0.1:7077
     before_install:
       - ./scripts/install_python.sh
-      - ./scripts/start_docker_db.sh
-      - ./scripts/start_docker_bblfsh.sh
+      - docker-compose -f docker-compose.yml -f docker-compose.host.yml up -d scylla bblfshd
       - ./scripts/get_apache_spark.sh "2.2.0" "2.7" || travis_terminate 1
     install:
       - make build
@@ -96,9 +94,8 @@ matrix:
   - scala: 2.11.2
     env: FE_PYTHON_TEST=true
     script:
-      - docker build -t srcd/gemini-fe -f FE.Dockerfile .
-      - docker run --rm -e PYTHONHASHSEED=0 srcd/gemini-fe pytest -v
-      - docker run -p 9001:9001 -e PYTHONHASHSEED=0 -d srcd/gemini-fe
+      - docker-compose -f docker-compose.yml -f docker-compose.host.yml up -d featurext
+      - docker-compose exec featurext pytest -v
       - ./sbt "test-only * -- -n tags.FEIntegration"
 
   - scala: 2.11.2
diff --git a/docker-compose.host.yml b/docker-compose.host.yml
index 8d0da4b9..ad51b500 100644
--- a/docker-compose.host.yml
+++ b/docker-compose.host.yml
@@ -7,10 +7,12 @@ services:
     ports:
       - "9042:9042"
 
-  feature_extractor:
+  featurext:
     ports:
       - "9001:9001"
 
   bblfshd:
     ports:
       - "9432:9432"
+    volumes:
+      - $HOME/bblfsh-drivers:/var/lib/bblfshd
diff --git a/docker-compose.yml b/docker-compose.yml
index 4792fde2..6de549e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
   scylla:
     image: scylladb/scylla:2.0.0
     volumes:
-      - db-data:/var/lib/scylla
+      - /var/lib/scylla
     command:
       - "--broadcast-address"
       - "127.0.0.1"
@@ -35,10 +35,6 @@ services:
     image: bblfsh/bblfshd:v2.4.2
     privileged: true
     volumes:
-      - bblfsh-storage:/var/lib/bblfshd
+      - /var/lib/bblfshd
     entrypoint: ["/bin/sh"]
-    command: ["-c", "bblfshd & wait 5 && bblfshctl driver install --recommended && tail -f /dev/null"]
-
-volumes:
-  db-data:
-  bblfsh-storage:
+    command: ["-c", "bblfshd & sleep 5 && bblfshctl driver install --recommended && tail -f /dev/null"]