Merge pull request #138 from zmstone/pin-kafka-docker-image-version-1.1.2

test: use latest Kafka docker image version

Author: zmstone

Makefile

@@ -1,3 +1,4 @@
+export KAFKA_IMAGE_VERSION ?= 1.1.2
 export KAFKA_VERSION ?= 4.0.0
 all: compile
 

scripts/docker-compose-4.yml renamed to scripts/docker-compose-kraft.yml

@@ -1,6 +1,6 @@
 services:
   kafka_1:
-    image: "zmstone/kafka:1.1-${KAFKA_VERSION}"
+    image: ${KAFKA_IMAGE_TAG}
     container_name: 'kafka-1'
     ports:
       - "9092:9092"
@@ -19,7 +19,7 @@ services:
       INNER_HOSTNAME: kafka-1
       VOTERS: "1@kafka-1:9090,2@kafka-2:9090"
   kafka_2:
-    image: "zmstone/kafka:1.1-${KAFKA_VERSION}"
+    image: ${KAFKA_IMAGE_TAG}
     container_name: 'kafka-2'
     ports:
       - "9192:9192"

scripts/docker-compose.yml

@@ -1,13 +1,13 @@
 services:
   zookeeper:
-    image: "zmstone/kafka:1.1-${KAFKA_VERSION}"
+    image: ${KAFKA_IMAGE_TAG}
     container_name: zookeeper
     command: run zookeeper
     network_mode: host
   kafka_1:
     depends_on:
       - zookeeper
-    image: "zmstone/kafka:1.1-${KAFKA_VERSION}"
+    image: ${KAFKA_IMAGE_TAG}
     container_name: 'kafka-1'
     network_mode: host
     environment:
@@ -21,7 +21,7 @@ services:
   kafka_2:
     depends_on:
       - zookeeper
-    image: "zmstone/kafka:1.1-${KAFKA_VERSION}"
+    image: ${KAFKA_IMAGE_TAG}
     container_name: 'kafka-2'
     network_mode: host
     environment:

scripts/setup-test-env.sh

@@ -6,8 +6,8 @@ docker ps > /dev/null || {
     exit 1
 }
 
-VERSION=${KAFKA_VERSION:-4.0.0}
-if [ -z $VERSION ]; then VERSION=$1; fi
+KAFKA_IMAGE_VERSION="${KAFKA_IMAGE_VERSION:-1.1.2}"
+VERSION="${KAFKA_VERSION:-${1:-4.0.0}}"
 
 case $VERSION in
   0.9*)
@@ -37,8 +37,9 @@ case $VERSION in
     ;;
 esac
 
-echo "Using KAFKA_VERSION=$VERSION"
 export KAFKA_VERSION=$VERSION
+export KAFKA_IMAGE_TAG="zmstone/kafka:${KAFKA_IMAGE_VERSION}-${KAFKA_VERSION}"
+echo "Using $KAFKA_IMAGE_TAG"
 
 KAFKA_MAJOR=$(echo "$KAFKA_VERSION" | cut -d. -f1)
 if [ "$KAFKA_MAJOR" -lt 3 ]; then
@@ -56,12 +57,12 @@ fi
 TD="$(cd "$(dirname "$0")" && pwd)"
 
 docker compose -f $TD/docker-compose.yml down || true
-docker compose -f $TD/docker-compose-4.yml down || true
+docker compose -f $TD/docker-compose-kraft.yml down || true
 
 if [[ "$NEED_ZOOKEEPER" = true ]]; then
     docker compose -f $TD/docker-compose.yml up -d
 else
-    docker compose -f $TD/docker-compose-4.yml up -d
+    docker compose -f $TD/docker-compose-kraft.yml up -d
 fi
 
 # give kafka some time