Merge pull request #50 from ceph/m-fix

consolidate container deploy

.travis.yml

@@ -21,5 +21,4 @@ script:
 deploy:
   - provider: script
     script:
-      - ./deploy-rbd.sh
-      - ./deploy-cephfs.sh
+      - ./deploy.sh

deploy-rbd.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
-    docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io 
-    make push-rbdplugin-container
-fi

deploy.sh

@@ -2,5 +2,5 @@
 
 if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
     docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io 
-    make push-cephfs-container
+    make push-rbdplugin-container push-cephfsplugin-container
 fi