You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@senssoft.apache.org by le...@apache.org on 2018/03/12 15:58:37 UTC
[23/40] incubator-senssoft git commit: Added Distill back.
Added Distill back.
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/f4d5ba44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/f4d5ba44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/f4d5ba44
Branch: refs/heads/asf-site
Commit: f4d5ba440272373178fef8ff71afb6db415e30f4
Parents: 4d65e0d
Author: msb3399 <mb...@draper.com>
Authored: Mon Aug 7 12:27:00 2017 -0400
Committer: msb3399 <mb...@draper.com>
Committed: Mon Aug 7 12:27:00 2017 -0400
----------------------------------------------------------------------
docker/distill/Dockerfile | 19 ++-----------------
docker/docker-compose.yml | 23 ++++++++++++-----------
2 files changed, 14 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/f4d5ba44/docker/distill/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/distill/Dockerfile b/docker/distill/Dockerfile
index f69edc8..972edb3 100644
--- a/docker/distill/Dockerfile
+++ b/docker/distill/Dockerfile
@@ -22,29 +22,14 @@ RUN apt-get -yqq update
RUN mkdir -p /usr/src
WORKDIR /usr/src
-# Install git
-##RUN sudo -E apt-get -yqq install \
- ##git
-
# Clone Distill
RUN git clone https://github.com/apache/incubator-senssoft-distill.git distill
WORKDIR /usr/src/distill
RUN git pull
-
-# Add code
-##WORKDIR /app
-##ADD setup.py /app
-
-ADD requirements.txt /distill
-
# Install Distill dependencies
RUN pip install -r requirements.txt
-# Expose Ports
-EXPOSE 8090
-
# Rest
-ADD . /app
-RUN python setup.py develop
-CMD python distill/server.py
\ No newline at end of file
+RUN python setup.py install
+CMD dev
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/f4d5ba44/docker/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9dc69b7..b1337f2 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -118,6 +118,18 @@ services:
networks:
- esnet
+ # Distill
+ distill:
+ build: ./distill
+ container_name: senssoft-distill
+ ports:
+ - 8090:8090
+ depends_on:
+ - "elasticsearch1"
+ - "elasticsearch2"
+ networks:
+ - esnet
+
volumes:
esdata1:
driver: local
@@ -127,17 +139,6 @@ volumes:
networks:
esnet:
-
- # distill:
- # build: ./distill
- # container_name: distill
- # ports:
- # - 8090:8090
- # depends_on:
- # - elasticsearch
- # links:
- # - elasticsearch
-
# db:
# container_name: tap-db
# build: ./db