diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 27aae462b1f2bffb8025e52e74569eddfa89941e..fc370f60751f4f4bbf170e5f8439938987fbb46b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -24,6 +24,16 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock + web: + image: montisim-server + ports: + - 5001:5001 + depends_on: + - rmi-server + - rpc-server + volumes: + - ../research/web:/app + rmi-server: image: rmi-server:latest depends_on: @@ -35,52 +45,18 @@ services: environment: ZOO_SERVERS: zoo1 - rpc-server1: - image: rpc-server:latest - depends_on: - - kafka - - zoo1 - ports: - - 6000:6000 - - 8787:8787 - restart: always - hostname: rpc1 - environment: - ZOO_SERVERS: zoo1 - KAFKA_SERVERS: kafka:9092 - volumes: - - ../rpc/target:/app - - rpc-server2: + rpc-server: image: rpc-server:latest depends_on: - kafka - zoo1 - ports: - - 6001:6000 +# ports: +# - 6000:6000 # - 8787:8787 restart: always - hostname: rpc2 - # hostname: rmi-server environment: ZOO_SERVERS: zoo1 KAFKA_SERVERS: kafka:9092 volumes: - ../rpc/target:/app - rpc-server3: - image: rpc-server:latest - depends_on: - - kafka - - zoo1 - ports: - - 6002:6000 -# - 8787:8787 - restart: always - hostname: rpc3 - # hostname: rmi-server - environment: - ZOO_SERVERS: zoo1 - KAFKA_SERVERS: kafka:9092 - volumes: - - ../rpc/target:/app diff --git a/docker/integration_test.sh b/docker/integration_test.sh new file mode 100644 index 0000000000000000000000000000000000000000..3531a2db94faa2bc1d2f038ce0c3a2d0ee59680f --- /dev/null +++ b/docker/integration_test.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +docker-compose up --scale rpc-server=3 rmi-server=5 -d +docker-compose run --rm web nosetests -s test_simulation.py +docker-compose down \ No newline at end of file diff --git a/research/web/Dockerfile b/research/web/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..50a05754932274f6760f86138a93047d8858fc69 --- /dev/null +++ b/research/web/Dockerfile @@ -0,0 +1,8 @@ +FROM python:3.6 + +WORKDIR /app + +COPY ./requirements.txt ./requirements.txt + +RUN apt-get update && apt-get install -y libmetis-dev +RUN pip install -r requirements.txt \ No newline at end of file diff --git a/research/web/requirements.txt b/research/web/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..54a44deabf9bd0b2c23dec1733e0fbd3f38ca3f5 --- /dev/null +++ b/research/web/requirements.txt @@ -0,0 +1,22 @@ +beautifulsoup4==4.7.1 +bs4==0.0.1 +Click==7.0 +decorator==4.3.0 +Flask==1.0.2 +gevent==1.4.0 +greenlet==0.4.15 +grpcio==1.17.1 +itsdangerous==1.1.0 +Jinja2==2.10 +kafka==1.3.5 +kazoo==2.6.0 +logzero==1.5.0 +lxml==4.3.0 +MarkupSafe==1.1.0 +metis==0.2a4 +networkx==2.2 +nose==1.3.7 +protobuf==3.6.1 +six==1.12.0 +soupsieve==1.6.2 +Werkzeug==0.14.1