From 978daf3d407d1d7991946d97dbb48011e7b4f6bc Mon Sep 17 00:00:00 2001
From: Kiran Kamineni <kiran.k.kamineni@intel.com>
Date: Wed, 4 Apr 2018 21:31:16 -0700
Subject: moving the docker build portion

Moving the docker build scripts too

Issue-ID: AAF-213
Change-Id: I97c1de10d198c6afc97c763c54d862a10b5b7f92
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
---
 sms-quorum/bin/build_quorum_image.sh  | 57 -----------------------------------
 sms-quorum/bin/quorumdockerfile       |  9 ------
 sms-service/bin/build_quorum_image.sh | 57 +++++++++++++++++++++++++++++++++++
 sms-service/bin/quorumdockerfile      |  9 ++++++
 4 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100755 sms-quorum/bin/build_quorum_image.sh
 delete mode 100644 sms-quorum/bin/quorumdockerfile
 create mode 100755 sms-service/bin/build_quorum_image.sh
 create mode 100644 sms-service/bin/quorumdockerfile

diff --git a/sms-quorum/bin/build_quorum_image.sh b/sms-quorum/bin/build_quorum_image.sh
deleted file mode 100755
index c154764..0000000
--- a/sms-quorum/bin/build_quorum_image.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-DIRNAME=`dirname $0`
-DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
-echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
-cd ${DOCKER_BUILD_DIR}
-
-BUILD_ARGS="--no-cache"
-ORG="onap"
-VERSION="1.1.0"
-PROJECT="aaf"
-IMAGE="smsquorum"
-DOCKER_REPOSITORY="nexus3.onap.org:10003"
-IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
-TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
-
-if [ $HTTP_PROXY ]; then
-    BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
-fi
-if [ $HTTPS_PROXY ]; then
-    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
-fi
-#Need to create makefile
-function generate_binary {
-    pushd ../src/smsquorum
-    make build
-    popd
-    cp ../target/quorumclient .
-}
-
-function remove_binary {
-    rm quorumclient
-}
-
-function build_image {
-    echo "Start build docker image: ${IMAGE_NAME}"
-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest -f quorumdockerfile .
-}
-
-function push_image_tag {
-    TAG_NAME=$1
-    echo "Start push ${TAG_NAME}"
-    docker tag ${IMAGE_NAME}:latest ${TAG_NAME}
-    docker push ${TAG_NAME}
-}
-
-function push_image {
-    echo "Start push ${IMAGE_NAME}:latest"
-    docker push ${IMAGE_NAME}:latest
-
-    push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest
-    push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest
-}
-
-generate_binary
-build_image
-push_image
-remove_binary
\ No newline at end of file
diff --git a/sms-quorum/bin/quorumdockerfile b/sms-quorum/bin/quorumdockerfile
deleted file mode 100644
index 2e1a191..0000000
--- a/sms-quorum/bin/quorumdockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM alpine:3.7
-
-LABEL name="aaf-sms"
-LABEL version=1.0.0
-LABEL maintainer="Girish Havaldar <hg0071052@techmahindra.com>"
-
-ADD quorumclient /smsquorum/bin/quorumclient
-RUN chmod +x /smsquorum/bin/quorumclient
-ENTRYPOINT ["/smsquorum/bin/quorumclient"]
diff --git a/sms-service/bin/build_quorum_image.sh b/sms-service/bin/build_quorum_image.sh
new file mode 100755
index 0000000..c154764
--- /dev/null
+++ b/sms-service/bin/build_quorum_image.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+DIRNAME=`dirname $0`
+DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
+echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
+cd ${DOCKER_BUILD_DIR}
+
+BUILD_ARGS="--no-cache"
+ORG="onap"
+VERSION="1.1.0"
+PROJECT="aaf"
+IMAGE="smsquorum"
+DOCKER_REPOSITORY="nexus3.onap.org:10003"
+IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
+
+if [ $HTTP_PROXY ]; then
+    BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
+fi
+if [ $HTTPS_PROXY ]; then
+    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
+fi
+#Need to create makefile
+function generate_binary {
+    pushd ../src/smsquorum
+    make build
+    popd
+    cp ../target/quorumclient .
+}
+
+function remove_binary {
+    rm quorumclient
+}
+
+function build_image {
+    echo "Start build docker image: ${IMAGE_NAME}"
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest -f quorumdockerfile .
+}
+
+function push_image_tag {
+    TAG_NAME=$1
+    echo "Start push ${TAG_NAME}"
+    docker tag ${IMAGE_NAME}:latest ${TAG_NAME}
+    docker push ${TAG_NAME}
+}
+
+function push_image {
+    echo "Start push ${IMAGE_NAME}:latest"
+    docker push ${IMAGE_NAME}:latest
+
+    push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest
+    push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest
+}
+
+generate_binary
+build_image
+push_image
+remove_binary
\ No newline at end of file
diff --git a/sms-service/bin/quorumdockerfile b/sms-service/bin/quorumdockerfile
new file mode 100644
index 0000000..2e1a191
--- /dev/null
+++ b/sms-service/bin/quorumdockerfile
@@ -0,0 +1,9 @@
+FROM alpine:3.7
+
+LABEL name="aaf-sms"
+LABEL version=1.0.0
+LABEL maintainer="Girish Havaldar <hg0071052@techmahindra.com>"
+
+ADD quorumclient /smsquorum/bin/quorumclient
+RUN chmod +x /smsquorum/bin/quorumclient
+ENTRYPOINT ["/smsquorum/bin/quorumclient"]
-- 
cgit 1.2.3-korg