From 886e0b2a1f1139d9e329b9afd89a405537c0125c Mon Sep 17 00:00:00 2001 From: Jeet Parekh Date: Wed, 29 May 2019 22:03:15 +0530 Subject: [PATCH] fix neo4j and esv7 dependencies --- .travis.yml | 6 ++++++ Dockerfile | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6df7be7..65247ef 100755 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ jobs: - sudo dpkg -i seabolt-1.7.4-Linux-ubuntu-16.04.deb - sudo apt-get install -y libssl-dev build-essential - go get github.com/neo4j/neo4j-go-driver/neo4j + - go get gopkg.in/olivere/elastic.v7 - go get github.com/appbaseio/abc || true - mkdir private - git clone https://$PAT@github.com/appbaseio-confidential/abc-import private @@ -32,6 +33,8 @@ jobs: skip_cleanup: true file: abc-linux draft: true + on: + all_branches: true - name: macos os: osx @@ -43,6 +46,7 @@ jobs: - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/seabolt-1.7.4-Darwin/usr/local/share/pkgconfig - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/seabolt-1.7.4-Darwin/usr/local/lib - go get github.com/neo4j/neo4j-go-driver/neo4j + - go get gopkg.in/olivere/elastic.v7 - go get github.com/appbaseio/abc || true - mkdir private - git clone https://$PAT@github.com/appbaseio-confidential/abc-import private @@ -56,3 +60,5 @@ jobs: skip_cleanup: true file: abc-macos draft: true + on: + all_branches: true diff --git a/Dockerfile b/Dockerfile index 2ec61b7..7aaaaf5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,11 +15,14 @@ MAINTAINER Siddharth Kothari ARG ABC_BUILD=oss ENV ABC_BUILD ${ABC_BUILD} -RUN mkdir -p $GOPATH/github.com/src/appbaseio/abc && \ +RUN apt-get update && \ + apt-get install -y libssl-dev && \ + mkdir -p $GOPATH/github.com/src/appbaseio/abc && \ mkdir -p /abc && \ curl -LO https://github.com/neo4j-drivers/seabolt/releases/download/v1.7.4/seabolt-1.7.4-Linux-ubuntu-18.04.deb && \ dpkg -i seabolt-1.7.4-Linux-ubuntu-18.04.deb && \ - go get github.com/neo4j/neo4j-go-driver/neo4j + go get github.com/neo4j/neo4j-go-driver/neo4j && \ + go get gopkg.in/olivere/elastic.v7 WORKDIR $GOPATH/src/github.com/appbaseio/abc -- GitLab