Merge branch 'master' into use_atlas_20

.travis.yml

@@ -5,22 +5,19 @@ services:
 
 env:
   global:
-  - secure: "myt7mwAs8XHHSqp1G9wWpIJbEU8/EWe7WH1+5TJCKx6B195UDV9DmTdMSBTXbhgcMWs6M2IYcAjZ5B2I1CVsgqLTQZaEHQGPh6YPu9MBAjWy2dlkCBr1fY68RPCYN24LCZcWId5yIVgHIBGtc5g5UzYn9S04wNMOxXC8xLJJT/OJs7FDx05gOvS1McTBnjrSduggm/Vh5omgag5j25x8waYN/Ct9BLw+mik3XGF21wjMMOy2T3+iaRPKir2UE8cKRbjT1VTjPELwtTec+JveBbuvazyGNsFH8QzTHBWmo6l1kI7/dydhvgwmF5JtCiWekovlqXnMPJyjQtq5/F9A3VuVOPloDaWVHGnyCfLjqllDbbsCWSdasmncO0p9ePnDEqQbDriT8lws8bNtjHUkvHytzEtZtE1MXVknLI4WeNhQtkfMn2p3NucFOx/NPSuGv6L3xP8gU/GO+ziP8Hnfz+8YmVGbdv2c3F52SCf3Cm2GmfiHwbb1KJa2+CqXwXHIB2PTf0r3J+sMTQgDo4bSSKyXiWModVS3E4BTpq/P+INAqXGst1jThQFXQW3/FlR0jC6Y8tvips7gF+/hwTeFmP1MF5XQBc2Jf9cfsyU8Yvdp0tPbGD3u5jwQzsiWbFQNDqjHTpRuY+iCZ85yfAriKLvWKzqKGSm/syllVwYwVHo="
-  - secure: "dca8qXy9CTQIQIZdDqzL0vx6+7PpQTkct3eTRrL8bQrCdv3xzNJ6R3RP9ZmRZQSw57PuDJSHrJV5Qra7pkWVjOCaJNrTiUG7p4Ilm99LxUleOhQXb0aMag8zq5A1NsYApd6iMm2R7npoR4k1frPStoFa6jM97lpxPqKnlmkOzYtb4VhBTiDPj48GXKY2IpKxwmAYgH2T+lsO0LkquGSxyacaPYNIIX4bYA6bBiPlhq1NGcuYpzu+hHraJwX3FYVENK/MlxTIGWm4I9DkcPJO3XEj7jCzCnun5mt+8GiXVsBhLsUcHsp+aKghBd00wYTfqhsHbr9m3A44fYxFR65N/6C5yg895j8aK1pKAMVu2qGSGmr0JRRhq0nkBvYs5qGnsOZohfhVkpLjis7gXCt0Wfxit28PQMygt3sfciCyW7iiLknaTrKuUXCyqJEWVLIW8w7DoQthJPBL6MD6EmmQ6MGU5Uc8V7rbiPqgvgYZcOPMODiGaFLsqg+bMntzK7/VYUwPefsxECOCqwq/seBbS2aIn8j1xXOpf+b2N7uW09rHlwqNd58B9lZVbipORkKV/7m9tDMpz2iH0NfkBCEtkcteaO1QnreOdZE40Yx1HErgxQlzRKSHIuLJZ4qMWW0AD/8kT0zJMUSj26xNTx2m9rrG7Jkpi8Br29LnI9pbRNY="
+  - secure: "eHLoemYocEBYOkJwZC75aWedgXtaKubGhBAo453OF8amiNhBpUz3k3YeLMdtT7RWqjtZS9Fnh96oqtn6aPuh+yrpzsQqwDcahuO0OsdRgp4n/4ltIfgpRTCl0FPfjVZtYuPWBh3XPfuzA5/yAjXKdUAxb6nUm6tqH2ZWl2MCLGpmKYQSpUBNypd4K4tr1DSefILwpYHmmHTWvB+T52Koq5Td4q2ZZ/72hj572iqHAbxdCQYyABGp8xk8dAl15YU6IIe5uKfCt+atTmFDe6G9ql9KKAlehYbNZ4qRFjuPUgt1JG9C908gZ78VhbHc9+xBvuYOfdahHrfSgdX4rPnPXpawJ/cGz57LbHcbp2kcYhcmGWUE+R4rdqwK48R5y6snL0bkIu738laNMkD4IVch5Q6KPngtqPuAcAfAsRbzkjm0VVGOKvMai4Ln6vjZpOjG/vfHL2X5YMp5xAcRdbgI6czu60SduXOHnr7oyyROilIH6cFDHgVCQajmobJ0oOuFewpmiCvv6xN8FSTELO4m9r4taXg+JRWai5VT14Y359ow8isvp85wJqTrIyo44CX7mbwumnCcPpQ0i3CFXheHCZnNTfoMJQXjPwo73KJVaZ51rfK4zHUXwXEijbnL/AgRZw3p5og/vBNEsM7+XKaBq49gs1DwyWT7UmHlmJUw0l0="
+  - secure: "EVkOu/3QzGCTfbl62AbQciBmkMR84x6x46Vue40LEom1tv6125/ckn7PADdnDEbwAHVp/tIR3VyBeQT2/UYkTD8YGN7M5U05kMxbZ5SJENuh6pSV8ykD1bclBp4HzQNJHcAq9ENxeDspk1VgPbxzOYklmmS/g2UQIzSEdpbIhSchvUFWf8/RuT976AWUVsWA+8Chmg+HR/KB5Jzz1WzHZRTgn3weBcZ+t/mVTqW/5jl6FbdoV0apbytAyfWfvlOvGhgW70HK4dUUjsQG8SOi12X6tkohSJBHwxTpC0EWITp5jFEhCdCZOM9MUONB38BPhFZqobQxVntRW/aKgkWFlvMVZWPz0MbuLxGhPq+0y6n5zSsu6N4xFfaDpN+2mUawJERxFn9aKS4m4tVaCHZi65zGsuOSA/hdFonTOoM9fLVG7Ei26B76pejlupwTl+TTw/r/qHOyC1jWQc62tmjYwBP6mPUWQVHgvNqTpPCRq4Ud+3liXigUO427ekU4qwSPykw9NZ1SCa7oXhnF74xTCKlItFHJY8pMNTnVOmu4aF5vW1QDUy2pyxDhtRR7PeYqp3pqqNF8rVf6tOo/5SwnS2uWDC3/ITzR9gIJeKtHKA7RnCphzrdR+ZYnJpzoqMajkL/zC03V7hK6B64eiYOStYyWJHyjRqQ6kF89CdL3tB4="
 
 # We will not build an image on the master tag, thereby forcing people to use tagged versions only
 # Also there is an issue with using TRAVIS_BRANCH for PRs since this variable will be set to the target of the PR (e.g. master for PR to master) and then build an image for master unwanted before the merge happened
 script:
-- echo "Running pipeline for branch ${TRAVIS_BRANCH}"
-- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-- export DOCKER_TAG="${TRAVIS_BRANCH/\//_}"
-- if [ "${TRAVIS_BRANCH}" != "master" ]; then 
+- if [ -n "$TRAVIS_TAG" ]; then 
+    echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
+    export DOCKER_TAG="${TRAVIS_BRANCH/\//_}";
     echo "Build image for tag ${DOCKER_TAG}";
     docker pull wbaa/rokku-dev-apache-atlas:latest;
     travis_wait 80 docker build --quiet -t wbaa/rokku-dev-apache-atlas:$DOCKER_TAG .;
     docker push wbaa/rokku-dev-apache-atlas:$DOCKER_TAG;
-  fi
-- if [ -n "$TRAVIS_TAG" ]; then 
     docker tag wbaa/rokku-dev-apache-atlas:$DOCKER_TAG wbaa/rokku-dev-apache-atlas:latest;
     docker push wbaa/rokku-dev-apache-atlas:latest;
-  fi
+  fi

docker-compose.yml

@@ -9,13 +9,11 @@ services:
     depends_on:
       - "zookeeper"
       - "kafka" 
-	  
   zookeeper:
     image: wurstmeister/zookeeper
     hostname: zookeeper
     ports:
-      - "2181:2181"
-	  
+      - "2181:2181"  
   kafka:
     container_name: kafka
     image: wurstmeister/kafka
@@ -28,4 +26,4 @@ services:
       KAFKA_ADVERTISED_PORT: 9092
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
     depends_on:
-      - zookeeper	  
+      - zookeeper