Versione aggiornata (+b0.18) e mr_wolf aggiornato

README.md

@@ -16,7 +16,7 @@ Informatica, Università degli Studi di Padova
 
 ### Versione di prodotto
 
-:fire: Versione corrente: `+b0.17`
+:fire: Versione corrente: `+b0.18`
 
 
 ### Git submodules 
@@ -25,11 +25,11 @@ Informatica, Università degli Studi di Padova
 | Sub-module | Cartella | Versione software  |
 |---|---|---|
 | [swe-docs](http://docs.redroundrobin.site) | `documentazione/`    | `n/d`      |
-| [swe-api](http://api.redroundrobin.site)   |       `api/`         | `v0.4.1-rc`  |
-| [swe-gateway](http://gateway.redroundrobin.site) | `gateway/`     | `v0.2.0-rc`  |
-| [swe-kafka-db](http://kafkadb.redroundrobin.site) | `kafka-db/`   | `v0.2.1-rc`  |
-| [swe-webapp](http://webapp.redroundrobin.site) |    `webapp/`     | `v0.4.0-rc`  |
-| [swe-telegram](http://telegram.redroundrobin.site) | `telegram/`  | `v0.2.0-rc`  |
+| [swe-api](http://api.redroundrobin.site)   |       `api/`         | `v1.0.0-rc`  |
+| [swe-gateway](http://gateway.redroundrobin.site) | `gateway/`     | `v1.0.0-rc`  |
+| [swe-kafka-db](http://kafkadb.redroundrobin.site) | `kafka-db/`   | `v1.0.0-rc`  |
+| [swe-webapp](http://webapp.redroundrobin.site) |    `webapp/`     | `v1.0.0-rc`  |
+| [swe-telegram](http://telegram.redroundrobin.site) | `telegram/`  | `v1.0.0-rc`  |
 
 
 ![SWE Docs Checker](https://github.com/RedRoundRobin/swe-docs/workflows/SWE%20Docs%20Checker/badge.svg)

docker-compose.riot.yml

@@ -51,4 +51,66 @@ services:
     ports:
       - "80:8000"
 
-
+  timescale:
+    container_name: db-timescale
+    build: ./database/Timescale
+    networks:
+      - kafka-net
+    ports:
+      - "3456:5432"
+    volumes:
+      - 'timescale_data:/var/lib/postgresql/data'
+
+  postgres:
+    container_name: db-postgre
+    build: ./database/Postgres
+    networks:
+      - kafka-net
+    ports:
+      - "6543:5432"
+    volumes:  
+      - 'postgres_data:/var/lib/postgresql/data'
+
+  zookeeper:
+    container_name: kafka-zookeeper
+    image: 'bitnami/zookeeper:3'
+    networks:
+      - kafka-net
+    ports: 
+      - '2181:2181'
+    volumes: 
+      - 'zookeeper_data:/bitnami'
+    environment: 
+      - ALLOW_ANONYMOUS_LOGIN=yes  
+
+  kafka:
+    container_name: kafka-core
+    image: 'bitnami/kafka:2'
+    networks:
+      - kafka-net
+    ports: 
+      - '9092:9092'
+      - '29092:29092'
+      - '29094:29094'
+    volumes: 
+      - 'kafka_data:/bitnami'
+    environment:
+      - KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181
+      - ALLOW_PLAINTEXT_LISTENER=yes
+      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=LISTENER_EXT:PLAINTEXT,LISTENER_INT:PLAINTEXT,REMOTE_EXT:PLAINTEXT
+      - KAFKA_CFG_LISTENERS=LISTENER_EXT://kafka:9092,LISTENER_INT://kafka:29092,REMOTE_EXT://kafka:29094
+      - KAFKA_CFG_ADVERTISED_LISTENERS=LISTENER_EXT://localhost:9092,LISTENER_INT://kafka-core:29092,REMOTE_EXT://core.host.redroundrobin.site:29094
+      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=LISTENER_INT
+    depends_on:
+      - zookeeper  
+
+volumes:
+  zookeeper_data:
+    driver: local
+  kafka_data:
+    driver: local
+  timescale_data:
+    driver: local
+  postgres_data:
+    driver: local 
+

mr_wolf.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#  Version 1
+#  Copyright 2020
 #      ___         __  ___                    __  ___       __   _    
 #    / _ \___ ___/ / / _ \___  __ _____  ___/ / / _ \___  / /  (_)__ 
 #   / , _/ -_) _  / / , _/ _ \/ // / _ \/ _  / / , _/ _ \/ _ \/ / _ \
@@ -31,7 +31,6 @@ errormex () {
 
 dockercompose_cmd () {
     docker-compose \
-        -f riot/docker-compose.yml \
         -f riot/docker-compose.riot.yml \
         $1
 }