From c4a34b2fe6f7317bf17fa478a734e5bdab30c278 Mon Sep 17 00:00:00 2001 From: HuabingZhao Date: Mon, 4 Sep 2017 19:33:48 +0800 Subject: Use maven to build kube2msb Issue-Id: OOM-61 Change-Id: Ic7e733c95e28b75b66535b343ae22c893db24531 Signed-off-by: HuabingZhao --- kube2msb/build/build.sh | 37 ----------------------------- kube2msb/build/docker/Dockerfile | 4 ---- kube2msb/build/docker/build_docker_image.sh | 36 ---------------------------- kube2msb/build/env.sh | 25 ------------------- 4 files changed, 102 deletions(-) delete mode 100644 kube2msb/build/build.sh delete mode 100644 kube2msb/build/docker/Dockerfile delete mode 100644 kube2msb/build/docker/build_docker_image.sh delete mode 100644 kube2msb/build/env.sh (limited to 'kube2msb/build') diff --git a/kube2msb/build/build.sh b/kube2msb/build/build.sh deleted file mode 100644 index 96c0835..0000000 --- a/kube2msb/build/build.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# force any errors to cause the script and job to end in failure -set -u - -DIRNAME=`dirname $0` -RUNHOME=`cd $DIRNAME/; pwd` -# set variable -. $RUNHOME/env.sh - -#create workdir -cd $buildDir -rm -rf $workDir -mkdir -p $workDir - -cp $dockerDir/build_docker_image.sh $workDir/ -cp $dockerDir/Dockerfile $workDir/ - -#build binary -cd $codeDir - -export GOPATH=$GOPATH -make clean -make - -cp kube2msb $workDir/ - -#build image -cd $workDir/ -chmod a+x *.sh -ls -l - -docker rmi $dockerRegistry/$appName:$appVersion -./build_docker_image.sh -n=$dockerRegistry/$appName -v=$appVersion -d=./docker - - - - diff --git a/kube2msb/build/docker/Dockerfile b/kube2msb/build/docker/Dockerfile deleted file mode 100644 index 849b07e..0000000 --- a/kube2msb/build/docker/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM alpine:3.3 -COPY kube2msb /bin/ - -ENTRYPOINT /bin/kube2msb --kube_master_url=${KUBE_MASTER_URL} --msb_url=${MSB_URL} \ No newline at end of file diff --git a/kube2msb/build/docker/build_docker_image.sh b/kube2msb/build/docker/build_docker_image.sh deleted file mode 100644 index ea9b690..0000000 --- a/kube2msb/build/docker/build_docker_image.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -for i in "$@" -do -case $i in - -n=*|--name=*) - NAME="${i#*=}" - shift - ;; - -v=*|--version=*) - VERSION="${i#*=}" - shift - ;; - -d=*|--dir=*) - DIR="${i#*=}" - shift - ;; -esac -done - -if [[ ${NAME} && ${VERSION} && ${DIR} ]]; then - echo "assign the x to all files and dirs under current dir.." - chmod +x -R . - echo "begin to build image ${NAME}.." - docker build --no-cache -t ${NAME}:${VERSION} . >/dev/null || { echo -e "\nBuild docker image failed!";exit 1; } - docker rmi $(docker images | grep "^" | awk '{print $3}') &>/dev/null - docker save -o kube2msb.tar ${NAME}:${VERSION} >/dev/null || { rm -f kube2msb.tar &>/dev/null;echo -e "\nSave docker image failed!";exit 1; } - if [ ! -d ${DIR} ]; then - mkdir -p ${DIR} - fi - mv ${NAME}.tar ${DIR}/${NAME}.tar &>/dev/null - echo "build completes!" -else - echo "not all -n and -v and -d are provided!" - exit 1 -fi diff --git a/kube2msb/build/env.sh b/kube2msb/build/env.sh deleted file mode 100644 index 1ce0bd8..0000000 --- a/kube2msb/build/env.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -dockerRegistry=nexus3.onap.org:10003 -appName=onap/oom/kube2msb -appVersion=latest - -homeDir=$WORKSPACE/kube2msb - -buildDir=$homeDir/build -dockerDir=$buildDir/docker -workDir=$buildDir/workDir - -GOPATH=$homeDir -codeDir=$GOPATH/src/kube2msb - - - -echo '###########################' -echo @APPNAME@ $appName -echo @APPVersion@ $appVersion -echo @homeDir@ $homeDir -echo @dockerDir@ $dockerDir -echo @workDir@ $workDir -echo @GOPATH@ $GOPATH -echo @codeDir@ $codeDir -echo '###########################' -- cgit 1.2.3-korg