[airavata] branch develop updated: Updating Kafka container and moving sshd container to main compose file

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 77b5f88  Updating Kafka container and moving sshd container to main 
compose file
77b5f88 is described below

commit 77b5f880ad44c979c1e0790ddde9865443e71db4
Author: Dimuthu Wannipurage <dimuthu.upeks...@gmail.com>
AuthorDate: Mon Mar 11 15:17:49 2019 -0400

    Updating Kafka container and moving sshd container to main compose file
---
 .../src/main/resources/docker-compose.yml              | 18 ++++++++++--------
 .../src/main/resources/pga/docker-compose.yml          |  6 ------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/modules/ide-integration/src/main/resources/docker-compose.yml 
b/modules/ide-integration/src/main/resources/docker-compose.yml
index 6736a09..25f873c 100644
--- a/modules/ide-integration/src/main/resources/docker-compose.yml
+++ b/modules/ide-integration/src/main/resources/docker-compose.yml
@@ -21,6 +21,7 @@ services:
       - MYSQL_PASSWORD=123456
     volumes:
       - ./database_scripts/init:/docker-entrypoint-initdb.d
+      - ./database_data:/var/lib/mysql
     ports:
         - "13306:3306"
     command: ['mysqld', '--character-set-server=utf8mb4', 
'--collation-server=utf8mb4_unicode_ci', '--sql_mode=']
@@ -38,15 +39,16 @@ services:
     ports:
       - "12181:2181"
   kafka:
-    image: confluentinc/cp-kafka:5.1.0
+    image: wurstmeister/kafka
     hostname: kafka
     ports:
       - "9092:9092"
     environment:
-      KAFKA_ADVERTISED_LISTENERS: 
LISTENER_DOCKER_INTERNAL://kafka1:19092,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 
LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
-      KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
-      KAFKA_BROKER_ID: 1
-      KAFKA_LOG4J_LOGGERS: 
"kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO"
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
\ No newline at end of file
+      KAFKA_ADVERTISED_HOST_NAME: localhost
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+  sshd:
+    image: dimuthuupe/sshd:1.0
+    volumes:
+      - ./exp-data-dir:/var/www/portals/gateway-user-data
+    ports:
+      - "22222:22"
\ No newline at end of file
diff --git a/modules/ide-integration/src/main/resources/pga/docker-compose.yml 
b/modules/ide-integration/src/main/resources/pga/docker-compose.yml
index cad944e..c796eae 100644
--- a/modules/ide-integration/src/main/resources/pga/docker-compose.yml
+++ b/modules/ide-integration/src/main/resources/pga/docker-compose.yml
@@ -9,9 +9,3 @@ services:
       - "8008:80"
     mem_limit: 3G
     mem_reservation: 3G
-  sshd:
-    image: dimuthuupe/sshd:1.0
-    volumes:
-      - ./exp-data-dir:/var/www/portals/gateway-user-data
-    ports:
-      - "22222:22"