From a18432457b9b558ad61803dd9b78261e9171e018 Mon Sep 17 00:00:00 2001
From: linwl <304115325@qq.com>
Date: Thu, 25 Feb 2021 11:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E6=95=B0=E7=BA=BF=E7=A8=8B=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 iotgateway_service_run.sh | 14 ++------------
 setup_dev.sh              | 10 +++++-----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/iotgateway_service_run.sh b/iotgateway_service_run.sh
index bb730ab..24c3730 100644
--- a/iotgateway_service_run.sh
+++ b/iotgateway_service_run.sh
@@ -13,8 +13,8 @@ if [[ $environment == 'pro' ]]; then
   #删除产生的None镜像
   docker rmi -f $(docker images | grep none | awk '{print $3}')
   docker ps -a
-else
-  if [[ $environment == 'test' ]]; then
+fi
+if [[ $environment == 'test' ]]; then
     #echo "开始远程构建容器"
     docker stop iot_gateway_service || true
     docker rm iot_gateway_service || true
@@ -26,14 +26,4 @@ else
     #删除产生的None镜像
     docker rmi -f $(docker images | grep none | awk '{print $3}')
     docker ps -a
-  else
-    docker stop iot_gateway_service || true
-    docker rm iot_gateway_service || true
-    docker rmi -f $(docker images | grep 139.224.254.18:5000/iot_gateway_service | awk '{print $3}')
-    docker pull 139.224.254.18:5000/iot_gateway_service:$version
-    docker run -v /home/data/iotgatewayserver/log:/var/log/iotgatewayserver -e active=dev --restart=always -d --network host  -p 8110:8110  --name iot_gateway_service telpo/iot_gateway_service:$version
-    #删除产生的None镜像
-    docker rmi -f $(docker images | grep none | awk '{print $3}')
-    docker ps -a
-  fi
 fi
diff --git a/setup_dev.sh b/setup_dev.sh
index 4700938..d6ddcbd 100644
--- a/setup_dev.sh
+++ b/setup_dev.sh
@@ -11,10 +11,10 @@ docker rmi -f $(docker images | grep telpo/iot_gateway_service | awk '{print $3}
 docker build . -t telpo/iot_gateway_service:$image_version
 
 #TODO:推送镜像到私有仓库
-echo '=================开始推送镜像======================='
-docker tag telpo/iot_gateway_service:$image_version 139.224.254.18:5000/iot_gateway_service:$image_version
-docker push 139.224.254.18:5000/iot_gateway_service:$image_version
-echo '=================推送镜像完成======================='
+#echo '=================开始推送镜像======================='
+#docker tag telpo/iot_gateway_service:$image_version 139.224.254.18:5000/iot_gateway_service:$image_version
+#docker push 139.224.254.18:5000/iot_gateway_service:$image_version
+#echo '=================推送镜像完成======================='
 
 #删除产生的None镜像
 docker rmi -f $(docker images | grep none | awk '{print $3}')
@@ -23,4 +23,4 @@ docker images
 # 启动容器
 docker run -v /home/data/iotgatewayserver/log:/var/log/iotgatewayserver -d -e active=dev --network host --restart=always  -p 8110:8110  --name iot_gateway_service telpo/iot_gateway_service:$image_version
 # 查看日志
-docker logs iot_gateway_service
+# docker logs iot_gateway_service