From eaaaeb36ad734101ed1ef94a7f84fdc8e3867551 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Mon, 8 Aug 2022 01:48:43 -0500
Subject: [PATCH] Use single-port notation for cloud-stream-kafka/rabbit
 samples

---
 cloud-stream-kafka/docker-compose.yml            | 16 +++++++++++-----
 .../src/main/resources/application.yml           |  4 +++-
 cloud-stream-rabbit/docker-compose.yml           |  5 +++--
 .../src/main/resources/application.yml           |  4 ++++
 spring-kafka/docker-compose.yml                  |  1 -
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/cloud-stream-kafka/docker-compose.yml b/cloud-stream-kafka/docker-compose.yml
index cc5abb65..91bdf62e 100644
--- a/cloud-stream-kafka/docker-compose.yml
+++ b/cloud-stream-kafka/docker-compose.yml
@@ -3,16 +3,22 @@ services:
   kafka:
     image: wurstmeister/kafka
     ports:
-      - "9092:9092"
+      - "9092"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=127.0.0.1
-      - KAFKA_ADVERTISED_PORT=9092
-      - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_LISTENERS: PLAINTEXT://:29092,PLAINTEXT_HOST://:9092
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:_{PORT_COMMAND}
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      PORT_COMMAND: "docker ps | grep kafka_1 | cut -d: -f 2 | cut -d- -f 1"
     depends_on:
       - zookeeper
+
   zookeeper:
     image: wurstmeister/zookeeper
     ports:
-      - "2181:2181"
+      - "2181"
     environment:
       - KAFKA_ADVERTISED_HOST_NAME=zookeeper
diff --git a/cloud-stream-kafka/src/main/resources/application.yml b/cloud-stream-kafka/src/main/resources/application.yml
index 2c0df5dc..97657cca 100644
--- a/cloud-stream-kafka/src/main/resources/application.yml
+++ b/cloud-stream-kafka/src/main/resources/application.yml
@@ -1,4 +1,6 @@
-spring.kafka.consumer.auto-offset-reset: earliest
+spring.kafka:
+  bootstrap-servers: "localhost:${KAFKA_PORT_9092:9092}"
+  consumer.auto-offset-reset: earliest
 
 spring.cloud:
   function:
diff --git a/cloud-stream-rabbit/docker-compose.yml b/cloud-stream-rabbit/docker-compose.yml
index 1e7655bb..ab5d2786 100644
--- a/cloud-stream-rabbit/docker-compose.yml
+++ b/cloud-stream-rabbit/docker-compose.yml
@@ -1,6 +1,7 @@
 version: '3'
 services:
   rabbitmq:
-    image: rabbitmq
+    image: 'rabbitmq:management'
     ports:
-      - 5672:5672
+      - "5672"
+      - "15672"
diff --git a/cloud-stream-rabbit/src/main/resources/application.yml b/cloud-stream-rabbit/src/main/resources/application.yml
index e9ee4cdc..aa9728e2 100644
--- a/cloud-stream-rabbit/src/main/resources/application.yml
+++ b/cloud-stream-rabbit/src/main/resources/application.yml
@@ -1,3 +1,7 @@
+spring.rabbitmq:
+  host: "${RABBITMQ_HOST:localhost}"
+  port: "${RABBITMQ_PORT_5672:5672}"
+
 spring.cloud:
   function:
     definition: graalSupplier;graalUppercaseFunction;graalLoggingConsumer
diff --git a/spring-kafka/docker-compose.yml b/spring-kafka/docker-compose.yml
index 7a78384f..91bdf62e 100644
--- a/spring-kafka/docker-compose.yml
+++ b/spring-kafka/docker-compose.yml
@@ -2,7 +2,6 @@ version: '3'
 services:
   kafka:
     image: wurstmeister/kafka
-    hostname: kafka
     ports:
       - "9092"
     volumes: