Changing docker image build to use filename

Changing the docker image build process to use
a specified file instead of default Dockerfile
Also, fixing the line endings in .sh file to use
Unix line endings.

Issue-ID: AAF-213
Change-Id: I715a8d86a3bd2433f92d42e216a1f52f56cebf9b
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>

2 files changed, 56 insertions, 57 deletions

diff --git a/sms-quorum/bin/build_image.sh b/sms-quorum/bin/build_quorum_image.sh
index 554dc63..c154764 100644..100755
--- a/sms-quorum/bin/build_image.sh
+++ b/sms-quorum/bin/build_quorum_image.sh
@@ -1,58 +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/smsquorum .

-}

-

-function remove_binary {

-    rm smsquorum

-}

-

-function build_image {

-    echo "Start build docker image: ${IMAGE_NAME}"

-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest .

-}

-

-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

-    push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP}

-}

-

-generate_binary

-build_image

-push_image

+#!/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/Dockerfile b/sms-quorum/bin/quorumdockerfile
index 2e1a191..2e1a191 100644
--- a/sms-quorum/bin/Dockerfile
+++ b/sms-quorum/bin/quorumdockerfile