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>

diff --git a/sms-quorum/bin/build_image.sh b/sms-quorum/bin/build_quorum_image.sh
old mode 100644 (file)
new mode 100755 (executable)
similarity index 82%
rename from sms-quorum/bin/build_image.sh
rename to sms-quorum/bin/build_quorum_image.sh
index 554dc63..c154764
--- a/sms-quorum/bin/build_image.sh
+++ b/sms-quorum/bin/build_quorum_image.sh
@@ -1,58 +1,57 @@
-#!/bin/bash\r
-DIRNAME=`dirname $0`\r
-DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`\r
-echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"\r
-cd ${DOCKER_BUILD_DIR}\r
-\r
-BUILD_ARGS="--no-cache"\r
-ORG="onap"\r
-VERSION="1.1.0"\r
-PROJECT="aaf"\r
-IMAGE="smsquorum"\r
-DOCKER_REPOSITORY="nexus3.onap.org:10003"\r
-IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"\r
-TIMESTAMP=$(date +"%Y%m%dT%H%M%S")\r
-\r
-if [ $HTTP_PROXY ]; then\r
-    BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"\r
-fi\r
-if [ $HTTPS_PROXY ]; then\r
-    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"\r
-fi\r
-#Need to create makefile\r
-function generate_binary {\r
-    pushd ../src/smsquorum\r
-    make build\r
-    popd\r
-    cp ../target/smsquorum .\r
-}\r
-\r
-function remove_binary {\r
-    rm smsquorum\r
-}\r
-\r
-function build_image {\r
-    echo "Start build docker image: ${IMAGE_NAME}"\r
-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest .\r
-}\r
-\r
-function push_image_tag {\r
-    TAG_NAME=$1\r
-    echo "Start push ${TAG_NAME}"\r
-    docker tag ${IMAGE_NAME}:latest ${TAG_NAME}\r
-    docker push ${TAG_NAME}\r
-}\r
-\r
-function push_image {\r
-    echo "Start push ${IMAGE_NAME}:latest"\r
-    docker push ${IMAGE_NAME}:latest\r
-\r
-    push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest\r
-    push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest\r
-    push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP}\r
-}\r
-\r
-generate_binary\r
-build_image\r
-push_image\r
+#!/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
similarity index 100%
rename from sms-quorum/bin/Dockerfile
rename to sms-quorum/bin/quorumdockerfile

diff --git a/sms-service/bin/build_image.sh b/sms-service/bin/build_image.sh
index 7a9ddba..3855903 100755 (executable)
--- a/sms-service/bin/build_image.sh
+++ b/sms-service/bin/build_image.sh
@@ -1,58 +1,2 @@
 #!/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="sms"
-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
-
-function generate_binary {
-    pushd ../src/sms
-    make build
-    popd
-    cp ../target/sms .
-}
-
-function remove_binary {
-    rm sms
-}
-
-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
-remove_binary
\ No newline at end of file
+./build_sms_image.sh
\ No newline at end of file

diff --git a/sms-service/bin/build_sms_image.sh b/sms-service/bin/build_sms_image.sh
new file mode 100755 (executable)
index 0000000..3599c77
--- /dev/null
+++ b/sms-service/bin/build_sms_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="sms"
+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
+
+function generate_binary {
+    pushd ../src/sms
+    make build
+    popd
+    cp ../target/sms .
+}
+
+function remove_binary {
+    rm sms
+}
+
+function build_image {
+    echo "Start build docker image: ${IMAGE_NAME}"
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest -f smsdockerfile .
+}
+
+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/Dockerfile b/sms-service/bin/smsdockerfile
similarity index 100%
rename from sms-service/bin/Dockerfile
rename to sms-service/bin/smsdockerfile