diff --git a/images/Dockerfile b/images/Dockerfile index 15b55149..247bd642 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -44,9 +44,6 @@ RUN curl -O "https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_jav WORKDIR $KAFKA_HOME -COPY scripts/start-kafka.sh /opt/kafka/bin/ COPY scripts/metrics-config.yml /opt/kafka/ -COPY scripts/generate-configuration.sh /opt/kafka/ -COPY scripts/readiness-check.sh /opt/kafka/ USER $UNAME diff --git a/images/docker-version.sh b/images/docker-version.sh index 7a222b20..49e9403c 100644 --- a/images/docker-version.sh +++ b/images/docker-version.sh @@ -1,2 +1,2 @@ -DOCKER_IMAGE_VERSION="0.2.0" +DOCKER_IMAGE_VERSION="0.2.1" KAFKA_BASE_TECH_VERSION="2.3.0" diff --git a/images/scripts/generate-configuration.sh b/images/scripts/generate-configuration.sh deleted file mode 100755 index bdbcc958..00000000 --- a/images/scripts/generate-configuration.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - -KAFKA_BROKER_ID=${HOSTNAME##*-} - -# LISTENERS CONFIGURATION -LISTENERS="PLAINTEXT://0.0.0.0:${KAFKA_BROKER_PORT}" -# ADVERTISED LISTENERS -ADVERTISED_LISTENERS="PLAINTEXT://$(hostname -f):${KAFKA_BROKER_PORT}" -LISTENER_SECURITY_PROTOCOL_MAP="PLAINTEXT:PLAINTEXT" -SASL_ENABLED_MECHANISMS="" - -if [[ "$KAFKA_CLIENT_ENABLED" = "true" ]]; then - LISTENERS="${LISTENERS},CLIENT://0.0.0.0:${KAFKA_CLIENT_PORT}" - ADVERTISED_LISTENERS="${ADVERTISED_LISTENERS},CLIENT://$(hostname -f):${KAFKA_CLIENT_PORT}" - - if [[ "$KAFKA_CLIENT_AUTHENTICATION" = "scram-sha-512" ]]; then - SASL_ENABLED_MECHANISMS="SCRAM-SHA-512\n$SASL_ENABLED_MECHANISMS" - LISTENER_SECURITY_PROTOCOL_MAP="${LISTENER_SECURITY_PROTOCOL_MAP},CLIENT:SASL_PLAINTEXT" - CLIENT_LISTENER=$(cat <&1 | grep -q 'open' diff --git a/images/scripts/start-kafka.sh b/images/scripts/start-kafka.sh deleted file mode 100755 index 22f1d86b..00000000 --- a/images/scripts/start-kafka.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -${KAFKA_HOME}/generate-configuration.sh > ${KAFKA_HOME}/server.properties - -echo "starting the kafka broker using broker.id ${HOSTNAME##*-}..." -KAFKA_OPTS="${KAFKA_OPTS} ${METRICS_OPTS}" exec ${KAFKA_HOME}/bin/kafka-server-start.sh ${KAFKA_HOME}/server.properties