| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253 | 
							- <<<<<<< HEAD
 
- #!/usr/bin/env bash
 
- # 定义应用组名
 
- group_admin_name='zhongzheng'
 
- # 定义应用名称
 
- app_admin_name='zhongzheng-saas-pre'
 
- =======
 
- #!/usr/bin/env bash
 
- # 定义应用组名
 
- group_admin_name='zhongzheng-pre'
 
- # 定义应用名称
 
- app_admin_name='zhongzheng-saas-admin-pre'
 
- >>>>>>> pre
 
- # 定义应用版本
 
- app_admin_version='1.0-SNAPSHOT'
 
- # 定义应用环境
 
- profile_active='pre'
 
- echo '----copy jar admin----'
 
- docker stop ${app_admin_name}
 
- echo '----stop container admin----'
 
- docker rm ${app_admin_name}
 
- echo '----rm container admin----'
 
- docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
 
- echo '----rm image admin----'
 
- # 打包编译docker镜像
 
- <<<<<<< HEAD
 
- docker build -f /mydata/maven/build/Dockerfile-admi -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
 
- =======
 
- docker build -f /mydata-pre/maven/build/Dockerfile-admi -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
 
- >>>>>>> pre
 
- echo '----build image admin----'
 
- docker run \
 
- -p 6030:5030 \
 
- --name ${app_admin_name} \
 
- --restart=always \
 
- --link mysql:db \
 
- -e 'spring.profiles.active'=${profile_active} \
 
- -e TZ="Asia/Shanghai" \
 
- -v /etc/localtime:/etc/localtime \
 
- <<<<<<< HEAD
 
- -v /usr/local/temp/fonts:/usr/share/fonts \
 
- -v /mydata/app/${app_admin_name}/logs:/var/logs \
 
- =======
 
- -v /usr/share/fonts:/usr/share/fonts \
 
- -v /mydata-pre/app/${app_admin_name}/logs:/var/logs \
 
- >>>>>>> pre
 
- -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 
- echo '----start container admin----'
 
 
  |