From 468de91f0284758fcab69b7e022b6a8ce748c1af Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Wed, 4 Apr 2018 14:03:56 -0700 Subject: 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 --- sms-quorum/bin/Dockerfile | 9 ------ sms-quorum/bin/build_image.sh | 58 ------------------------------------ sms-quorum/bin/build_quorum_image.sh | 57 +++++++++++++++++++++++++++++++++++ sms-quorum/bin/quorumdockerfile | 9 ++++++ sms-service/bin/Dockerfile | 13 -------- sms-service/bin/build_image.sh | 58 +----------------------------------- sms-service/bin/build_sms_image.sh | 57 +++++++++++++++++++++++++++++++++++ sms-service/bin/smsdockerfile | 13 ++++++++ 8 files changed, 137 insertions(+), 137 deletions(-) delete mode 100644 sms-quorum/bin/Dockerfile delete mode 100644 sms-quorum/bin/build_image.sh create mode 100755 sms-quorum/bin/build_quorum_image.sh create mode 100644 sms-quorum/bin/quorumdockerfile delete mode 100644 sms-service/bin/Dockerfile create mode 100755 sms-service/bin/build_sms_image.sh create mode 100644 sms-service/bin/smsdockerfile diff --git a/sms-quorum/bin/Dockerfile b/sms-quorum/bin/Dockerfile deleted file mode 100644 index 2e1a191..0000000 --- a/sms-quorum/bin/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM alpine:3.7 - -LABEL name="aaf-sms" -LABEL version=1.0.0 -LABEL maintainer="Girish Havaldar " - -ADD quorumclient /smsquorum/bin/quorumclient -RUN chmod +x /smsquorum/bin/quorumclient -ENTRYPOINT ["/smsquorum/bin/quorumclient"] diff --git a/sms-quorum/bin/build_image.sh b/sms-quorum/bin/build_image.sh deleted file mode 100644 index 554dc63..0000000 --- a/sms-quorum/bin/build_image.sh +++ /dev/null @@ -1,58 +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/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 -remove_binary \ No newline at end of file diff --git a/sms-quorum/bin/build_quorum_image.sh b/sms-quorum/bin/build_quorum_image.sh new file mode 100755 index 0000000..c154764 --- /dev/null +++ b/sms-quorum/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-quorum/bin/quorumdockerfile b/sms-quorum/bin/quorumdockerfile new file mode 100644 index 0000000..2e1a191 --- /dev/null +++ b/sms-quorum/bin/quorumdockerfile @@ -0,0 +1,9 @@ +FROM alpine:3.7 + +LABEL name="aaf-sms" +LABEL version=1.0.0 +LABEL maintainer="Girish Havaldar " + +ADD quorumclient /smsquorum/bin/quorumclient +RUN chmod +x /smsquorum/bin/quorumclient +ENTRYPOINT ["/smsquorum/bin/quorumclient"] diff --git a/sms-service/bin/Dockerfile b/sms-service/bin/Dockerfile deleted file mode 100644 index be2777c..0000000 --- a/sms-service/bin/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM alpine:3.7 - -LABEL name="aaf-sms" -LABEL version=1.0.0 -LABEL maintainer="vamshi krishna " - -EXPOSE 10443 - -RUN mkdir /sms -ADD sms /sms/bin/sms -RUN chmod +x /sms/bin/sms - -ENTRYPOINT ["/sms/bin/sms"] diff --git a/sms-service/bin/build_image.sh b/sms-service/bin/build_image.sh index 7a9ddba..3855903 100755 --- 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 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/smsdockerfile b/sms-service/bin/smsdockerfile new file mode 100644 index 0000000..be2777c --- /dev/null +++ b/sms-service/bin/smsdockerfile @@ -0,0 +1,13 @@ +FROM alpine:3.7 + +LABEL name="aaf-sms" +LABEL version=1.0.0 +LABEL maintainer="vamshi krishna " + +EXPOSE 10443 + +RUN mkdir /sms +ADD sms /sms/bin/sms +RUN chmod +x /sms/bin/sms + +ENTRYPOINT ["/sms/bin/sms"] -- cgit 1.2.3-korg