From 8d2b5ff397e06849ab7224a1f89153bde3d531c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 27 Feb 2018 21:44:21 +0100 Subject: [PATCH] ceph-container-build-push-imgs: use a script from ceph-container MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Let's execute a script in the ceph-container project instead of writting the script here. ceph-build does the CI so let's keep it that way. Signed-off-by: Sébastien Han --- ceph-container-build-push-imgs/build/build | 29 +--------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/ceph-container-build-push-imgs/build/build b/ceph-container-build-push-imgs/build/build index 6bbb9a63..718ed42d 100644 --- a/ceph-container-build-push-imgs/build/build +++ b/ceph-container-build-push-imgs/build/build @@ -2,32 +2,5 @@ set -e -############# -# FUNCTIONS # -############# - -function login_docker_hub { - echo "Login in the Docker Hub" - docker login -u "$DOCKER_HUB_USERNAME" -p "$DOCKER_HUB_PASSWORD" -} - -function build_ceph_imgs { - make build.parallel -} - -function push_ceph_imgs { - make push -} - - -######## -# MAIN # -######## - -login_docker_hub -set -x cd "$WORKSPACE"/ceph-container/ || exit -build_ceph_imgs -push_ceph_imgs -cd - || exit - +bash -x contrib/build-push-ceph-container-imgs.sh -- 2.39.5