From 13ff64e1995ac06c43d453e5094d610f9becfd5c Mon Sep 17 00:00:00 2001 From: 2183691628 <2183691628@qq.com> Date: Thu, 2 Dec 2021 15:19:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20docker=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gps_card_admin_run.sh | 24 ++++++++++++------------ setup_development.sh | 16 ++++++++-------- setup_production.sh | 10 +++++----- setup_test.sh | 10 +++++----- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gps_card_admin_run.sh b/gps_card_admin_run.sh index bfb122c..264ed36 100644 --- a/gps_card_admin_run.sh +++ b/gps_card_admin_run.sh @@ -2,8 +2,8 @@ ### # @Date: 2021-11-15 09:37:49 # @LastEditors: JinxuChen - # @LastEditTime: 2021-12-02 09:20:59 - # @FilePath: \GpsCardAdmin\gps_card_admin.sh + # @LastEditTime: 2021-12-02 15:19:14 + # @FilePath: \GpsCardAdmin\gps_card_admin_run.sh # @description: 功能 ### environment=$1 @@ -11,24 +11,24 @@ version=$2 echo "环境变量为${environment},版本为$version!" if [[ ${environment} = 'production' ]]; then echo "开始远程构建容器" - docker stop gps_card_admin || true; - docker rm gps_card_admin || true; - docker rmi -f $(docker images | grep registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin | awk '{print $3}') + docker stop gps_card_admin_web || true; + docker rm gps_card_admin_web || true; + docker rmi -f $(docker images | grep registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin_web | awk '{print $3}') #docker login --username=telpo_linwl@1111649216405698 --password=telpo#1234 registry.cn-shanghai.aliyuncs.com; docker login --username=rzl_wangjx@1111649216405698 --password=telpo.123 registry.cn-shanghai.aliyuncs.com - docker pull registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin:$version - docker run -p 8802:80 -d --restart=always --name gps_card_admin registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin:$version; + docker pull registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin_web:$version + docker run -p 8803:80 -d --restart=always --name gps_card_admin_web registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin_web:$version; #删除产生的None镜像 docker rmi -f $(docker images | grep none | awk '{print $3}') docker ps -a elif [[ ${environment} == 'test' ]]; then echo "开始在测试环境远程构建容器" - docker stop gps_card_admin || true - docker rm gps_card_admin || true - docker rmi -f $(docker images | grep 139.224.254.18:5000/gps_card_admin | awk '{print $3}') - docker pull 139.224.254.18:5000/gps_card_admin:$version - docker run -p 8802:80 -d --restart=always --name gps_card_admin 139.224.254.18:5000/gps_card_admin:$version; + docker stop gps_card_admin_web || true + docker rm gps_card_admin_web || true + docker rmi -f $(docker images | grep 139.224.254.18:5000/gps_card_admin_web | awk '{print $3}') + docker pull 139.224.254.18:5000/gps_card_admin_web:$version + docker run -p 8803:80 -d --restart=always --name gps_card_admin_web 139.224.254.18:5000/gps_card_admin_web:$version; #删除产生的None镜像 docker rmi -f $(docker images | grep none | awk '{print $3}') docker ps -a diff --git a/setup_development.sh b/setup_development.sh index f826e71..eba347c 100644 --- a/setup_development.sh +++ b/setup_development.sh @@ -1,7 +1,7 @@ ### # @Author: JinxuChen # @Date: 2021-11-15 - # @LastEditTime: 2021-12-02 09:21:48 + # @LastEditTime: 2021-12-02 15:19:22 # @LastEditors: JinxuChen # @Description: In User Settings Edit # @FilePath: \GpsCardAdmin\setup_development.sh @@ -13,18 +13,18 @@ npm config list npm install npm run build-test image_version=`date +%Y%m%d%H%M`; -docker stop gps_card_admin || true; +docker stop gps_card_admin_web || true; # 删除gps_parent_web容器 -docker rm gps_card_admin || true; +docker rm gps_card_admin_web || true; # 删除镜像 -docker rmi -f $(docker images | grep telpo/gps_card_admin | awk '{print $3}') -# 构建telpo/gps_card_admin:$image_version镜像 -docker build . -t telpo/gps_card_admin:$image_version; +docker rmi -f $(docker images | grep telpo/gps_card_admin_web | awk '{print $3}') +# 构建telpo/gps_card_admin_web:$image_version镜像 +docker build . -t telpo/gps_card_admin_web:$image_version; #删除产生的None镜像 docker rmi -f $(docker images | grep none | awk '{print $3}') # 查看镜像列表 docker images; # 启动容器 -docker run -p 8802:80 -d --restart=always --name gps_card_admin telpo/gps_card_admin:$image_version; +docker run -p 8803:80 -d --restart=always --name gps_card_admin_web telpo/gps_card_admin_web:$image_version; # 查看日志 -docker logs gps_card_admin; +docker logs gps_card_admin_web; diff --git a/setup_production.sh b/setup_production.sh index 0333cd3..b0947a5 100644 --- a/setup_production.sh +++ b/setup_production.sh @@ -1,7 +1,7 @@ ### # @Author: JinxuChen # @Date: 2021-11-15 - # @LastEditTime: 2021-12-02 09:22:02 + # @LastEditTime: 2021-12-02 15:17:27 # @LastEditors: JinxuChen # @Description: In User Settings Edit # @FilePath: \GpsCardAdmin\setup_production.sh @@ -12,15 +12,15 @@ npm install npm run build image_version=$version; # 删除镜像 - docker rmi -f $(docker images | grep registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin | awk '{print $3}') + docker rmi -f $(docker images | grep registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin_web | awk '{print $3}') -docker build . -t telpo/gps_card_admin:$image_version; +docker build . -t telpo/gps_card_admin_web:$image_version; #TODO:推送镜像到阿里仓库 echo '=================开始推送镜像=======================' #docker login --username=telpo_linwl@1111649216405698 --password=telpo#1234 registry.cn-shanghai.aliyuncs.com; docker login --username=rzl_wangjx@1111649216405698 --password=telpo.123 registry.cn-shanghai.aliyuncs.com -docker tag telpo/gps_card_admin:$image_version registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin:$image_version -docker push registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin:$image_version +docker tag telpo/gps_card_admin_web:$image_version registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin_web:$image_version +docker push registry.cn-shanghai.aliyuncs.com/gps_card/gps_card_admin_web:$image_version echo '=================推送镜像完成=======================' #删除产生的None镜像 docker rmi -f $(docker images | grep none | awk '{print $3}') diff --git a/setup_test.sh b/setup_test.sh index 7db5e67..f15b3e0 100644 --- a/setup_test.sh +++ b/setup_test.sh @@ -1,7 +1,7 @@ ### # @Author: JinxuChen # @Date: 2021-11-15 - # @LastEditTime: 2021-12-02 09:22:16 + # @LastEditTime: 2021-12-02 15:17:38 # @LastEditors: JinxuChen # @Description: In User Settings Edit # @FilePath: \GpsCardAdmin\setup_test.sh @@ -16,14 +16,14 @@ npm run build-test image_version=$version # 删除镜像 docker rmi -f $( - docker images | grep 139.224.254.18:5000/gps_card_admin | awk '{print $3}' + docker images | grep 139.224.254.18:5000/gps_card_admin_web | awk '{print $3}' ) # 构建gps_card_admin:$image_version镜像 -docker build . -t telpo/gps_card_admin:$image_version; +docker build . -t telpo/gps_card_admin_web:$image_version; #TODO:推送镜像到私有仓库 echo '=================开始推送镜像=======================' -docker tag telpo/gps_card_admin:$image_version 139.224.254.18:5000/gps_card_admin:$image_version -docker push 139.224.254.18:5000/gps_card_admin:$image_version +docker tag telpo/gps_card_admin_web:$image_version 139.224.254.18:5000/gps_card_admin_web:$image_version +docker push 139.224.254.18:5000/gps_card_admin_web:$image_version echo '=================推送镜像完成=======================' #删除产生的None镜像 docker rmi -f $(docker images | grep none | awk '{print $3}')