From 8f58260cd958316eca41eee5bb0fc43f47bbeaac Mon Sep 17 00:00:00 2001 From: Varun Gudisena Date: Wed, 20 Sep 2017 23:47:50 -0500 Subject: [PATCH] Fix docker issues Updated dockerfile script to work in Ubuntu and reverting back to old msgrtr artifact due to issues with docker image issue-id: DMAAP-139 Change-Id: Ia6db6a5f40803a5f6b61288e9694f3597f4756f3 Signed-off-by: Varun Gudisena --- pom.xml | 8 ++++---- src/main/resources/docker-compose/Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index fa50fae..7508a40 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.onap.dmaap.messagerouter.messageservice dmaapMR1 - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT dmaap-messagerouter-messageservice Message Router - Restful interface built for kafka @@ -442,7 +442,7 @@ workstation DEV - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT 2.15.5 @@ -495,9 +495,9 @@ 1.3.2 - org.onap.dmaap.messagerouter.msgrtr + com.att.nsa msgrtr - 1.0.0 + 0.0.5 org.slf4j diff --git a/src/main/resources/docker-compose/Dockerfile b/src/main/resources/docker-compose/Dockerfile index 0649fcc..d1f96e8 100644 --- a/src/main/resources/docker-compose/Dockerfile +++ b/src/main/resources/docker-compose/Dockerfile @@ -15,8 +15,8 @@ ADD start-kafka.sh /usr/bin/start-kafka.sh ADD broker-list.sh /usr/bin/broker-list.sh ADD create-topics.sh /usr/bin/create-topics.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 && \ +RUN chmod a+x /usr/bin/start-kafka.sh; sync; +RUN chmod a+x /usr/bin/broker-list.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-kafka.sh"] -- 2.16.6