Skip to content

Commit

Permalink
Merge pull request #16 from a-mma/develop
Browse files Browse the repository at this point in the history
Dockerfile reverted and tested
  • Loading branch information
freakeinstein authored Jul 14, 2019
2 parents 60f099e + 414e1d9 commit e6ce091
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ RUN curl -L https://couchdb.apache.org/repo/bintray-pubkey.asc \
| apt-key add -
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y couchdb

# clone aquiladb src
RUN mkdir aquiladb && cd aquiladb && git clone https://github.com/a-mma/AquilaDB.git .
# clone AquilaDB src
RUN mkdir AquilaDB && cd AquilaDB && git clone https://github.com/a-mma/AquilaDB.git .

# setup node environment
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
RUN apt install -y nodejs
RUN apt-get install -y make
RUN cd aquiladb/src && rm package-lock.json || true && npm install
RUN cd AquilaDB/src && rm package-lock.json || true && npm install

# setup python environment
RUN python3 --version
Expand All @@ -30,11 +30,11 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86
echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \
echo "conda activate base" >> ~/.bashrc
ENV PATH /opt/conda/bin:$PATH
RUN conda create -n myenv python && conda install faiss-cpu -c pytorch
RUN conda create -n myenv python && conda install faiss-cpu=1.5.1 -c pytorch -y
RUN python -m pip install grpcio-tools

# install pm2 to run services
RUN npm install pm2 -g

RUN chmod +x /aquiladb/src/init_aquila_db.sh
CMD /aquiladb/src/init_aquila_db.sh && tail -f /dev/null
RUN chmod +x /AquilaDB/src/init_aquila_db.sh
CMD /AquilaDB/src/init_aquila_db.sh && tail -f /dev/null
6 changes: 3 additions & 3 deletions src/test/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ const btoa = require('btoa')
const atob = require('atob')
const njs = require('numjs')

var itercnt = 201
var rawcnt = 50
var veclen = 785
var itercnt = 1
var rawcnt = 1
var veclen = 8


var PROTO_PATH = __dirname + '/../proto/vecdb.proto'
Expand Down

0 comments on commit e6ce091

Please sign in to comment.