Fix Docker compose files and instructions (#93)

Author: Séamus Ó Ceanainn

README.md

@@ -62,7 +62,7 @@ For further examples see the [docker-compose.yml](basic-example/docker-compose.y
 docker-compose -f basic-example/docker-compose.yml up
 ```
 
-Run remora in IDE with kafka and zookeeper run by docker-compose 
+Run remora in IDE with kafka and zookeeper run by docker-compose. Note you must set `-e KAFKA_ENDPOINT="kafka:9094"` and `--network basic-example_default` for Remora to work with Kafka from docker-compose.
 
 ```bash
 docker-compose -f basic-example/docker-compose.yml up --scale remora=0
@@ -71,7 +71,7 @@ docker-compose -f basic-example/docker-compose.yml up --scale remora=0
 Remora is stateless, so test the scale of the API
 
 ```bash
-docker-compose -f scale-example/docker-compose.yml up --scale remora=3
+docker-compose -f basic-example/docker-compose.yml up --scale remora=3
 ```
 
 For examples with broker authentication see the [docker-compose.yml](auth-example/docker-compose.yml)

auth-example/auth.properties

@@ -1,3 +1,3 @@
 security.protocol=SASL_PLAINTEXT
 sasl.mechanism=PLAIN
-sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username="my-user" password="my-password";
+sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username="kafka" password="kafka-secret";

auth-example/docker-compose.yml

@@ -1,37 +1,51 @@
-version: '3'
-
+version: '3.2'
 services:
 
   zookeeper:
-    image: 'bitnami/zookeeper:latest'
-    environment:
-      - ALLOW_ANONYMOUS_LOGIN=yes
+    image: wurstmeister/zookeeper
     ports:
-     - '2181:2181'
+      - "2181:2181"
+    environment:
+      ALLOW_ANONYMOUS_LOGIN: 'yes'
+      ZOOKEEPER_SASL_ENABLED: 'false'
 
   kafka:
-    image: 'bitnami/kafka:latest'
+    image: wurstmeister/kafka
+    hostname: kafka
     depends_on:
       - zookeeper
-    environment:
-      - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
-      - ALLOW_PLAINTEXT_LISTENER=yes
-      - KAFKA_LISTENERS=SASL_PLAINTEXT://:9092
-      - KAFKA_ADVERTISED_LISTENERS=SASL_PLAINTEXT://localhost:9092
-      - KAFKA_BROKER_USER=my-user
-      - KAFKA_BROKER_PASSWORD=my-password
     ports:
-      - '9092:9092'
+      - "9092:9092"
+    volumes:
+      - ./server_jaas.conf:/etc/kafka/server_jaas.conf
+    environment:
+      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      KAFKA_LISTENERS: INTERNAL://0.0.0.0:9094,EXTERNAL://0.0.0.0:9092
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:9094,EXTERNAL://localhost:9092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:SASL_PLAINTEXT,EXTERNAL:SASL_PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
+      KAFKA_SASL_ENABLED_MECHANISMS: PLAIN
+      KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL: PLAIN
+      KAFKA_CREATE_TOPICS: "test-0:1:1,test-1:1:1"
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_BROKER_USER: kafka
+      KAFKA_BROKER_PASSWORD: kafka-secret
+      KAFKA_OPTS: "-Djava.security.auth.login.config=/etc/kafka/server_jaas.conf"
+      ZOOKEEPER_SASL_ENABLED: 'false'
+
 
   remora:
-    image: registry.opensource.zalan.do/machina/remora:1.3.0
+    # Built locally
+    image: remora:0.1.0-SNAPSHOT
+    # From Docker
+    #image: registry.opensource.zalan.do/buffalo/remora:2.0.0
     depends_on:
       - kafka
-    hostname: remora
     volumes:
       - ./auth.properties:/auth.properties
     environment:
-      KAFKA_ENDPOINT: "kafka:9092"
+      KAFKA_ENDPOINT: "kafka:9094"
       KAFKA_COMMAND_CONFIG: "/auth.properties"
+      VIRTUAL_HOST: 'localhost'
     ports:
       - "9000:9000"

auth-example/server_jaas.conf

@@ -0,0 +1,7 @@
+KafkaServer {
+   org.apache.kafka.common.security.plain.PlainLoginModule required
+   username="kafka"
+   password="kafka-secret"
+   user_kafka="kafka-secret";
+};
+Client{};

basic-example/docker-compose.yml

@@ -7,36 +7,36 @@ services:
       - "2181:2181"
 
   kafka:
-    image: wurstmeister/kafka:2.11-2.0.0
+    image: wurstmeister/kafka:2.13-2.8.1
     hostname: kafka
+    depends_on:
+      - zookeeper
     ports:
-      - target: 9092
-        published: 9092
-        protocol: tcp
-        mode: host
+      - "9092:9092"
     environment:
-      KAFKA_LISTENERS: PLAINTEXT://:9092
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
+      KAFKA_LISTENERS: INTERNAL://0.0.0.0:9094,EXTERNAL://0.0.0.0:9092
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:9094,EXTERNAL://localhost:9092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
       KAFKA_CREATE_TOPICS: "test-0:1:1,test-1:1:1"
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
 
+  nginx:
+    image: jwilder/nginx-proxy
+    volumes:
+      - "/var/run/docker.sock:/tmp/docker.sock:ro"
+    ports:
+      - "9000:80"
+
   remora:
     # Built locally
     image: remora:0.1.0-SNAPSHOT
     # From repo
-    #image: registry.opensource.zalan.do/machina/remora:1.3.0
+    #image: registry.opensource.zalan.do/buffalo/remora:2.0.0
     depends_on:
       - kafka
     environment:
-      KAFKA_ENDPOINT: "kafka:9092"
-#      JAVA_OPTS:
-#        -Xmx1g
-#        -Dcom.sun.management.jmxremote.rmi.port=9090
-#        -Dcom.sun.management.jmxremote=true
-#        -Dcom.sun.management.jmxremote.port=9090
-#        -Dcom.sun.management.jmxremote.ssl=false
-#        -Dcom.sun.management.jmxremote.authenticate=false
-#        -Dcom.sun.management.jmxremote.local.only=false
-#        -Djava.rmi.server.hostname=localhost
-    ports:
-      - 9000:9000
+      KAFKA_ENDPOINT: "kafka:9094"
+      VIRTUAL_HOST: 'localhost'
+    expose:
+      - 9000