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 <vg411h@att.com>

diff --git a/pom.xml b/pom.xml
index fa50fae..7508a40 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
        
        <groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
        <artifactId>dmaapMR1</artifactId>
-       <version>1.0.1-SNAPSHOT</version>
+       <version>1.0.2-SNAPSHOT</version>
        <name>dmaap-messagerouter-messageservice</name>
        <description>Message Router - Restful interface built for kafka</description>
         <licenses>
@@ -442,7 +442,7 @@
        
                <testRouteOffer>workstation</testRouteOffer>
                <testEnv>DEV</testEnv>
-               <dmaapImg>1.0.1-SNAPSHOT</dmaapImg>
+               <dmaapImg>1.0.2-SNAPSHOT</dmaapImg>
                <camel.version>2.15.5</camel.version>
        </properties>
 
@@ -495,9 +495,9 @@
                        <version>1.3.2</version>
                </dependency>
                <dependency>
-                         <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
+                         <groupId>com.att.nsa</groupId>
                          <artifactId>msgrtr</artifactId>
-                         <version>1.0.0</version>
+                         <version>0.0.5</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.slf4j</groupId>

diff --git a/src/main/resources/docker-compose/Dockerfile b/src/main/resources/docker-compose/Dockerfile
index 0649fcc..d1f96e8 100644 (file)
--- 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"]