From fe90017a3e68e86615c4f70cc0669cd17a36d152 Mon Sep 17 00:00:00 2001 From: gman Date: Fri, 9 Mar 2018 17:00:53 +0100 Subject: [PATCH] Makefile: updated push target --- Makefile | 5 ++++- deploy-cephfs.sh | 6 ++++++ deploy-rbd.sh | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 deploy-cephfs.sh create mode 100755 deploy-rbd.sh diff --git a/Makefile b/Makefile index 24c9663f9..f95a84712 100644 --- a/Makefile +++ b/Makefile @@ -42,9 +42,12 @@ cephfsplugin-container: cephfsplugin cp _output/cephfsplugin deploy/cephfs/docker docker build -t $(CEPHFS_IMAGE_NAME):$(CEPHFS_IMAGE_VERSION) deploy/cephfs/docker -push-container: rbdplugin-container +push-rbdplugin-container: rbdplugin-container docker push $(RBD_IMAGE_NAME):$(RBD_IMAGE_VERSION) +push-cephfsplugin-container: cephfsplugin-container + docker push $(CEPHFS_IMAGE_NAME):$(CEPHFS_IMAGE_VERSION) + clean: go clean -r -x rm -f deploy/rbd/docker/rbdplugin diff --git a/deploy-cephfs.sh b/deploy-cephfs.sh new file mode 100755 index 000000000..33daed31d --- /dev/null +++ b/deploy-cephfs.sh @@ -0,0 +1,6 @@ +#!/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-cephfs-container +fi diff --git a/deploy-rbd.sh b/deploy-rbd.sh new file mode 100755 index 000000000..63d88865a --- /dev/null +++ b/deploy-rbd.sh @@ -0,0 +1,6 @@ +#!/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