增加镜像版本号

增加镜像版本号

build/build_images.sh

@@ -25,6 +25,8 @@ function tms_success
 function tms_fail
 {
 
+
+
     msg="$*"
     echo "`eval $NOW` tms_fail:[$msg]" >>"${BUILD_LOG}"
     echo "`eval $NOW` tms_fail:[$msg]"
@@ -58,6 +60,8 @@ function fn_build_images()
         fn_print_err "Build <${MIRROR_ADDRESS}/${PROJECT_NAME}/${WANGYUAN_NAME}/${images_name}:${IMAGE_VERSION}> failure." || return $?
     fi
 
+    docker rmi "${MIRROR_ADDRESS}"/"${PROJECT_NAME}"/"${WANGYUAN_NAME}"/"${images_name}":"latest"
+
     #tag images latest
     docker tag "${MIRROR_ADDRESS}"/"${PROJECT_NAME}"/"${WANGYUAN_NAME}"/"${images_name}":"${IMAGE_VERSION}" "${MIRROR_ADDRESS}"/"${PROJECT_NAME}"/"${WANGYUAN_NAME}"/"${images_name}":latest  >"${ERROR_LOG}" 2>&1
     if [ $? -ne 0 ]
@@ -79,6 +83,13 @@ function fn_build_images()
         fn_print_err "Push<${MIRROR_ADDRESS}/${PROJECT_NAME}/${WANGYUAN_NAME}/${images_name}:latest> failure." || return $?
     fi
 
+    sleep 5
+    docker pull "${MIRROR_ADDRESS}"/"${PROJECT_NAME}"/"${WANGYUAN_NAME}"/"${images_name}":"latest" >"${ERROR_LOG}" 2>&1
+    if [ $? -ne 0 ] 
+    then
+        fn_print_err "Pull<${MIRROR_ADDRESS}/${PROJECT_NAME}/${WANGYUAN_NAME}/${images_name}:latest> failure." || return $?
+    fi  
+
     return 0
 
 }
@@ -129,8 +140,8 @@ fn_main()
     #定义日志打印的路径
     BUILD_LOG=/tmp/${MODUL_NAME}/build.log
     ERROR_LOG=/tmp/${MODUL_NAME}/error.log
-    
-    #创建日志文件
+   
+    #创建日志文件 
     [ -d /tmp/${MODUL_NAME} ] && rm -rf /tmp/${MODUL_NAME}
     mkdir -p /tmp/${MODUL_NAME}
     cd /tmp/${MODUL_NAME} && touch build.log error.log
@@ -168,6 +179,7 @@ fn_main()
     cp /data/ftp/${pkg_name} /tmp/${MODUL_NAME}
     cd /tmp/${MODUL_NAME} && tar -zxvf ${pkg_name} --wildcards ${pkg_dir}/Dockerfile
     cp -p ${pkg_dir}/Dockerfile ./ && rm -rf  ${pkg_dir}
+    sed -i "/^ENV APP_NAME/a\ENV IMAGES_VERSION ${IMAGE_VERSION}" Dockerfile
 
     #build镜像
     cd /tmp/${MODUL_NAME}
@@ -180,9 +192,9 @@ fn_main()
     fi
 
     #清理临时目录
-	tms_success "Build ${MODUL_NAME} images Success."
-    cd /tmp && rm -rf "${MODUL_NAME}"    
-    
+    tms_success "Build ${MODUL_NAME} images Success."
+    cd /tmp && rm -rf "${MODUL_NAME}"
+
     return 0
 
 }