From 7377d765937717319a178af694b455eb1ce0ed89 Mon Sep 17 00:00:00 2001
From: ljupcovangelski <ljupco@airy.co>
Date: Fri, 23 Sep 2022 09:12:55 +0200
Subject: [PATCH] [#3764] Kafka SASL cluster

---
 infrastructure/images/kafka/Dockerfile                 | 2 +-
 infrastructure/images/kafka/Makefile                   | 4 ++--
 infrastructure/images/kafka/scripts/configure-kafka.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/infrastructure/images/kafka/Dockerfile b/infrastructure/images/kafka/Dockerfile
index 64416471f5..90f9d675af 100644
--- a/infrastructure/images/kafka/Dockerfile
+++ b/infrastructure/images/kafka/Dockerfile
@@ -3,7 +3,7 @@ FROM openjdk:8-jre-alpine
 LABEL maintainer "https://github.com/airyhq"
 LABEL name="kafka" version=${INSTALL_KAFKA_VERSION}
 
-ENV INSTALL_KAFKA_VERSION 2.7.0
+ENV INSTALL_KAFKA_VERSION 2.8.2
 ENV INSTALL_SCALA_VERSION 2.13
 ENV INSTALL_MIRROR="https://downloads.apache.org/"
 
diff --git a/infrastructure/images/kafka/Makefile b/infrastructure/images/kafka/Makefile
index 6da969fb57..2cde2481a1 100644
--- a/infrastructure/images/kafka/Makefile
+++ b/infrastructure/images/kafka/Makefile
@@ -2,5 +2,5 @@ build:
 	docker build -t airy-kafka .
 
 release: build
-	docker tag airy-kafka ghcr.io/airyhq/infrastructure/kafka:2.7.0
-	docker push ghcr.io/airyhq/infrastructure/kafka:2.7.0
+	docker tag airy-kafka ghcr.io/airyhq/infrastructure/kafka:2.8.2
+	docker push ghcr.io/airyhq/infrastructure/kafka:2.8.2
diff --git a/infrastructure/images/kafka/scripts/configure-kafka.sh b/infrastructure/images/kafka/scripts/configure-kafka.sh
index 431c204c63..4e0e3df336 100755
--- a/infrastructure/images/kafka/scripts/configure-kafka.sh
+++ b/infrastructure/images/kafka/scripts/configure-kafka.sh
@@ -20,7 +20,7 @@ ADVERTISED_LISTENERS=$(echo "${AIRY_ADVERTISED_LISTENERS}" | \
 # Insert all other KAFKA_* env variables as settings
 for VAR in $(env)
 do
-  if [[ $VAR =~ ^KAFKA_ && ! $VAR =~ ^KAFKA_VERSION && ! $VAR =~ ^KAFKA_[0-9] && ! $VAR =~ ^KAFKA_PORT && ! $VAR =~ ^KAFKA_SERVICE_ ]]; then
+  if [[ $VAR =~ ^KAFKA_ && ! $VAR =~ ^KAFKA_VERSION && ! $VAR =~ ^KAFKA_[0-9] && ! $VAR =~ ^KAFKA_PORT && ! $VAR =~ ^KAFKA_OPTS && ! $VAR =~ ^KAFKA_SERVICE_ ]]; then
     kafka_name=$(echo "$VAR" | sed -r "s/KAFKA_(.*)=.*/\1/g" | tr '[:upper:]' '[:lower:]' | tr _ .)
     env_var=$(echo "$VAR" | sed -r "s/(.*)=.*/\1/g")
     echo "$kafka_name=${!env_var}" >> /etc/kafka/server.properties