Merge VFRAME functionality into Alegre #7847

Author: infojunkie

.gitmodules

@@ -22,10 +22,6 @@
 	path = alegre
 	url = [email protected]:meedan/alegre.git
 	branch = develop
-[submodule "vframe"]
-	path = vframe
-	url = [email protected]:meedan/vframe.git
-  branch = develop
 [submodule "check-bots"]
 	path = check-bots
 	url = [email protected]:meedan/check-bots.git

README.md

@@ -12,7 +12,7 @@ This is a [Docker Compose](https://docs.docker.com/compose/) configuration that
 - `git clone --recursive [email protected]:meedan/check.git && cd check`
 - Configuration: copy and edit the `*.example` files in the submodules
 - Update your [virtual memory settings](https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html), e.g. by setting `vm.max_map_count=262144` in `/etc/sysctl.conf`
-- `docker-compose build && docker-compose up`
+- `docker-compose build && docker-compose up --abort-on-container-exit`
 
 ## Available services and container names
 
@@ -23,8 +23,7 @@ This is a [Docker Compose](https://docs.docker.com/compose/) configuration that
 - Check Slack Bot (container `bot`) at `check-bot/dist`, a ZIP file that should be deployed to AWS Lambda
 - Pender service API (container `pender`) at [http://localhost:3200/api](http://localhost:3200/api) - use `dev` as API key
 - Alegre service API (container `alegre`) at [http://localhost:3100](http://localhost:3100)
-- vFrame service API (container `vframe`) at [http://localhost:5000](http://localhost:5000)
-- Montage web client (container `montage`) at [http://localhost:8080](http://localhost:8080)
+- MinIO storage service UI (container `minio`) at [http://localhost:9000](http://localhost:9000) - use `AKIAIOSFODNN7EXAMPLE` / `wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY` to login
 - Elasticsearch API (container `elasticsearch`) at [http://localhost:9200](http://localhost:9200)
 - Kibana Elasticsearch UI (container `kibana`) at [http://localhost:5601](http://localhost:5601)
 - PostgreSQL (container `postgres`) at `localhost:5432` (use a standard Pg admin tool to connect)
@@ -64,10 +63,9 @@ This is a [Docker Compose](https://docs.docker.com/compose/) configuration that
 - [Check web client](https://github.com/meedan/check-web)
 - [Pender service API](https://github.com/meedan/pender)
 - [Alegre service API](https://github.com/meedan/alegre)
-- [vFrame service API](https://github.com/meedan/vframe)
-- [Montage web client](https://github.com/meedan/montage-web)
+- [Check Slack bot](https://github.com/meedan/check-slack-bot)
 
 ## Troubleshooting and known issues
 
-- Upon initial installation, the submodules may be checked out at a specific commit instead of the `develop` branch. You will need to go into each submodule and issue an explicit `git checkout develop`.
+- Upon initial installation, the submodules may be checked out at a specific commit instead of the `develop` branch. You can issue this command to fix `git submodule foreach bash -c 'git checkout develop'`
 - Upon initial installation, to make sure the frontend is up to date, issue an explicit `docker-compose exec web npm run build` and `docker-compose exec montage npm run build`.

alegre

@@ -6,14 +6,16 @@ volumes:
   minio:
   web-node_modules:
   bots-node_modules:
+networks:
+  dev:
 services:
   elasticsearch:
     build: alegre/elasticsearch
     environment:
       - "discovery.type=single-node"
       - "transport.host=127.0.0.1"
       - "xpack.security.enabled=false"
-      - "ALEGRE_URL=http://alegre:5000"
+      - "ALEGRE_URL=http://alegre:3100"
       - "cluster.name=docker-cluster"
       - "bootstrap.memory_lock=true"
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Dlog4j2.disable.jmx=true"
@@ -26,6 +28,8 @@ services:
     volumes:
       - "./elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml"
       - "elasticsearch:/usr/share/elasticsearch/data"
+    networks:
+      - dev
   postgres:
     image: postgres:9.5
     command: postgres -c config_file=/etc/postgresql.conf
@@ -36,12 +40,16 @@ services:
       - "postgres:/var/lib/postgresql/data"
     environment:
       POSTGRES_PASSWORD: postgres
+    networks:
+      - dev
   redis:
     image: redis:5
     ports:
       - "6379:6379"
     volumes:
       - "redis:/data"
+    networks:
+      - dev
   minio:
     image: minio/minio
     command: server /data
@@ -52,6 +60,8 @@ services:
     environment:
       MINIO_ACCESS_KEY: AKIAIOSFODNN7EXAMPLE
       MINIO_SECRET_KEY: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+    networks:
+      - dev
   api:
     build: check-api
     ports:
@@ -63,12 +73,13 @@ services:
       - redis
       - pender
       - alegre
-      - vframe
     volumes:
       - "./check-api:/app"
     environment:
       RAILS_ENV: development
       SERVER_PORT: 3000
+    networks:
+      - dev
   api-background:
     build: check-api
     command: /app/docker-background.sh
@@ -79,6 +90,8 @@ services:
     environment:
       RAILS_ENV: development
       SERVER_PORT: 3000
+    networks:
+      - dev
   pender:
     build: pender
     shm_size: 1G
@@ -93,6 +106,8 @@ services:
     environment:
       RAILS_ENV: development
       SERVER_PORT: 3200
+    networks:
+      - dev
   pender-background:
     build: pender
     command: /app/docker-background.sh
@@ -104,6 +119,8 @@ services:
     environment:
       RAILS_ENV: development
       SERVER_PORT: 3200
+    networks:
+      - dev
   web:
     build: check-web
     ports:
@@ -119,6 +136,8 @@ services:
       NODE_ENV: development
       SERVER_PORT: 3333
       MODE: development
+    networks:
+      - dev
   kibana:
     image: docker.elastic.co/kibana/kibana:6.3.0
     ports:
@@ -127,6 +146,8 @@ services:
       - elasticsearch
     environment:
       ELASTICSEARCH_URL: http://elasticsearch:9200
+    networks:
+      - dev
   alegre:
     build: alegre
     ports:
@@ -140,16 +161,8 @@ services:
       BOILERPLATE_ENV: dev
       ALEGRE_PORT: 3100
       REDIS_DATABASE: 2
-  vframe:
-    build: vframe
-    volumes:
-      - "./vframe:/root/vframe"
-    env_file:
-      - vframe/.env_file
-    depends_on:
-      - postgres
-    ports:
-      - "5000:5000"
+    networks:
+      - dev
   bots:
     build: check-bots
     volumes:
@@ -162,3 +175,5 @@ services:
     environment:
       NODE_ENV: development
       SERVER_PORT: 8586
+    networks:
+      - dev

check-api

@@ -1,4 +1,7 @@
 version: "2.1"
+networks:
+  default:
+    name: dev
 services:
   chromedriver:
     build: chromedriver
@@ -39,7 +42,3 @@ services:
       BOILERPLATE_ENV: test
       ALEGRE_PORT: 3100
       REDIS_DATABASE: 3
-  vframe:
-    environment:
-      DB_NAME: vframe_test
-      FLASK_ENV: test

check-slack-bot

@@ -7,7 +7,6 @@ path:
    logs: /usr/share/elasticsearch/logs
    data: /usr/share/elasticsearch/data
    repo: /usr/share/elasticsearch/snapshots
-   # scripts: /usr/share/elasticsearch/scripts
 cluster:
    name: ${HOSTNAME}-cluster
 node: