RUNHOME=`cd $DIRNAME/; pwd`
echo @RUNHOME@ $RUNHOME
-echo @JAVA_HOME@ $JAVA_HOME
-
-#build
-mvn clean install
-
-
-
-#cooy
+#copy
RELEASE_BASE_DIR=$RUNHOME/release
-CONSUL_RELEASE_DIR=${RELEASE_BASE_DIR}/msb-consul
-
-rm -rf $CONSUL_RELEASE_DIR
-mkdir $CONSUL_RELEASE_DIR -p
-
-DOCKER_RUN_NAME=msb_consul
-DOCKER_IMAGE_NAME=msb_consul
-DOCKER_RELEASE_VERSION=0.7.5
-
-cp -r $RUNHOME/consul/target/version/* ${CONSUL_RELEASE_DIR}
-cp $RUNHOME/ci/build_docker_image.sh ${CONSUL_RELEASE_DIR}
-#build docker image
-cd ${CONSUL_RELEASE_DIR}
-chmod 777 build_docker_image.sh
-
-#clear old version
-docker rm -f ${DOCKER_RUN_NAME}
-docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}
-
-
-./build_docker_image.sh -n=${DOCKER_IMAGE_NAME} -v=${DOCKER_RELEASE_VERSION} -d=./docker
-
-#docker run
-docker run -d --net=host --name ${DOCKER_RUN_NAME} ${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}
-docker ps |grep ${DOCKER_RUN_NAME}
-
-
RELEASE_DIR=${RELEASE_BASE_DIR}/msb-discovery
DOCKER_RUN_NAME=msb_discovery
DOCKER_IMAGE_NAME=msb_discovery
DOCKER_RELEASE_VERSION=latest
+DOCKER_REPOSITORY=nexus3.onap.org:10003
rm -rf $RELEASE_DIR
mkdir $RELEASE_DIR -p
chmod 777 build_docker_image.sh
docker rm -f ${DOCKER_RUN_NAME}
-docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}
+docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}
-./build_docker_image.sh -n=${DOCKER_IMAGE_NAME} -v=${DOCKER_RELEASE_VERSION} -d=./docker
+./build_docker_image.sh -n=${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME} -v=${DOCKER_RELEASE_VERSION} -d=./docker
#docker run
-docker run -d --net=host --name ${DOCKER_RUN_NAME} ${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}
+docker run -d --net=host --name ${DOCKER_RUN_NAME} ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}
docker ps |grep ${DOCKER_RUN_NAME}
+
+echo "Pushing ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}"
+docker push ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}
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 "^<none>" | awk '{print $3}') &>/dev/null
- docker save -o ${NAME}.tar ${NAME}:${VERSION} >/dev/null || { rm -f ${NAME}.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
+ # docker save -o ${NAME}.tar ${NAME}:${VERSION} >/dev/null || { rm -f ${NAME}.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!"
-FROM openjdk:8.0.72\r
-ENV BASE /opt/application/msb-discover\r
-ENV LD_LIBRARY_PATH /lib64\r
-ADD msb-discovery*.tar.gz /opt/application\r
-WORKDIR /opt/application/msb-discovery\r
+# Dockerfile - msb-discover\r
+FROM nexus3.onap.org:10003/onap/msb/msb_base:latest\r
+COPY msb-discover*.tar.gz /usr/src\r
+\r
+RUN tar -xzf /usr/src/msb-discover*.tar.gz -C /usr/local --strip-components=1; \\r
+ rm /usr/src/msb-discover*.tar.gz\r
+ \r
+WORKDIR /usr/local\r
EXPOSE 10081\r
ENTRYPOINT exec $PWD/startup4docker.sh
\ No newline at end of file