From fddf6e2348d222471913ea7175cf842d38ad7b0f Mon Sep 17 00:00:00 2001 From: sunil unnava Date: Wed, 13 Feb 2019 11:43:55 -0500 Subject: [PATCH] change when to update start-mirrormaker.sh Issue-ID: DMAAP-911 Change-Id: Ibddfb21ab77c6f194a11a9d395cec4f3a7c22ff6 Signed-off-by: sunil unnava --- src/main/docker/Dockerfile | 3 +-- src/main/docker/start-mirrormaker.sh | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 024d075..b7f303d 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -18,6 +18,7 @@ ADD consumer.properties /opt/etc/consumer.properties ADD producer.properties /opt/etc/producer.properties ADD kafka11aaf-jar-with-dependencies.jar /tmp/kafka11aaf-jar-with-dependencies.jar ADD dmaapMMAgent.jar /tmp/dmaapMMAgent.jar +ADD kafka-run-class.sh /tmp/kafka-run-class.sh RUN chmod a+x /tmp/download-kafka.sh && sync && /tmp/download-kafka.sh && tar xfz /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -C /opt && rm /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz && ln -s /opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION} /opt/kafka @@ -30,13 +31,11 @@ ADD broker-list.sh /usr/bin/broker-list.sh ADD create-topics.sh /usr/bin/create-topics.sh ADD start-kafkaOrMirrorMaker.sh /usr/bin/start-kafkaOrMirrorMaker.sh ADD start-mirrormaker.sh /usr/bin/start-mirrormaker.sh -ADD kafka-run-class.sh ${KAFKA_HOME}/bin/kafka-run-class.sh # The scripts need to have executable permission RUN chmod a+x /usr/bin/start-kafka.sh && \ chmod a+x /usr/bin/broker-list.sh && \ chmod a+x /usr/bin/start-kafkaOrMirrorMaker.sh && \ chmod a+x /usr/bin/start-mirrormaker.sh && \ - chmod a+x ${KAFKA_HOME}/bin/kafka-run-class.sh && \ chmod a+x /usr/bin/create-topics.sh # Use "exec" form so that it runs as PID 1 (useful for graceful shutdown) CMD ["start-kafkaOrMirrorMaker.sh"] diff --git a/src/main/docker/start-mirrormaker.sh b/src/main/docker/start-mirrormaker.sh index 00e4848..152498a 100644 --- a/src/main/docker/start-mirrormaker.sh +++ b/src/main/docker/start-mirrormaker.sh @@ -143,7 +143,10 @@ export KAFKA_OPTS="-Djava.security.auth.login.config=$KAFKA_HOME/config/kafka_se echo "10.12.6.214 aaf-onap-beijing-test aaf-onap-beijing-test.osaaf.org aaf-onap-test.osaaf.org" >> /etc/hosts + mkdir /opt/logs +cp /tmp/kafka-run-class.sh /opt/kafka/bin +chmod /opt/kafka/bin/kafka-run-class.sh java -jar /tmp/dmaapMMAgent.jar -- 2.16.6