修改配置

docker/Dockerfile

@@ -9,7 +9,6 @@ COPY /lib /ins/lib/
 COPY *.jar  /ins/ROOT.jar
 
 ENV SERVER_PORT=8888
-ENV ACTIVE=prod
 ENV TimeZone=Asia/Shanghai
 
 RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone
@@ -18,4 +17,4 @@ EXPOSE ${SERVER_PORT}
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk add --update ttf-dejavu fontconfig && rm -rf /var/cache/apk/* && mkfontscale && mkfontdir && fc-cache
 
-ENTRYPOINT ["java", "-Dloader.path=/ins/lib/", "-jar", "/ins/ROOT.jar", "--spring.profiles.active=$ACTIVE", "--server.port=8888"]
+ENTRYPOINT ["java", "-Dloader.path=/ins/lib/", "-jar", "/ins/ROOT.jar", "--server.port=8888"]

docker/shell-pre.sh

@@ -0,0 +1,39 @@
+# 源jar路径
+# SOURCE_PATH=/usr/local/data/jenkins/workspace/insagent/target
+# Dockerfile路径
+DOCKER_FILE_PATH=/usr/local/java/insAgency-pre
+# 容器id
+CID=$(''docker ps | grep "ins" | awk '{print $1}''')
+echo $CID
+# 运行docker容器
+function run(){
+  echo "开始构建镜像..."
+  cd $DOCKER_FILE_PATH
+  echo "当前路径如下"
+  pwd
+  # 构建前判断是否存在镜像，存在则删除
+  if [ -n "$CID" ]; then
+    echo "存在demo容器，CID=$CID,重启docker容器 ..."
+    # 停止容器运行
+    sudo docker stop $CID
+    # 删除容器
+    sudo docker rm $CID
+    # 删除镜像
+    sudo docker rmi ins
+    echo "删除镜像和容器成功，下面开始构建新镜像"
+  else
+    echo "不存在people-healthy容器，下面直接开始构建镜像"
+  fi
+  # 构建镜像
+  docker build -t ins .
+  echo "创建容器成功"
+  docker images
+  # 杀死特定端口进程
+  # mypid=$(netstat -apn|grep 9001|awk '{print $7}'|cut -d/ -f1);
+  # echo $mypid
+  # kill -9 $mypid
+  docker run -it --name ins -p 8081:8888 -e "--spring.profiles.active=pre" -p 9999:9999 --restart=always -v /usr/local/java/insAgency:/ins --mount type=bind,source=/nasData,destination=/nasData -v /usr/local/java/insAgency/logs:/ins/logs -d ins:latest
+}
+
+#入口
+run

docker/shell-prod.sh

@@ -0,0 +1,39 @@
+# 源jar路径
+# SOURCE_PATH=/usr/local/data/jenkins/workspace/insagent/target
+# Dockerfile路径
+DOCKER_FILE_PATH=/usr/local/java/insAgency
+# 容器id
+CID=$(''docker ps | grep "ins" | awk '{print $1}''')
+echo $CID
+# 运行docker容器
+function run(){
+  echo "开始构建镜像..."
+  cd $DOCKER_FILE_PATH
+  echo "当前路径如下"
+  pwd
+  # 构建前判断是否存在镜像，存在则删除
+  if [ -n "$CID" ]; then
+    echo "存在demo容器，CID=$CID,重启docker容器 ..."
+    # 停止容器运行
+    sudo docker stop $CID
+    # 删除容器
+    sudo docker rm $CID
+    # 删除镜像
+    sudo docker rmi ins
+    echo "删除镜像和容器成功，下面开始构建新镜像"
+  else
+    echo "不存在people-healthy容器，下面直接开始构建镜像"
+  fi
+  # 构建镜像
+  docker build -t ins .
+  echo "创建容器成功"
+  docker images
+  # 杀死特定端口进程
+  # mypid=$(netstat -apn|grep 9001|awk '{print $7}'|cut -d/ -f1);
+  # echo $mypid
+  # kill -9 $mypid
+  docker run -it --name ins -p 8080:8888 -e "--spring.profiles.active=prod" -p 9999:9999 --restart=always -v /usr/local/java/insAgency:/ins --mount type=bind,source=/nasData,destination=/nasData -v /usr/local/java/insAgency/logs:/ins/logs -d ins:latest
+}
+
+#入口
+run

docker/shell.sh

@@ -1,10 +1,6 @@
 # 源jar路径
 # SOURCE_PATH=/usr/local/data/jenkins/workspace/insagent/target
 # Dockerfile路径
-if [ -z "$1"];then
-  $1=prod
-fi
-
 DOCKER_FILE_PATH=/usr/local/java/insAgency
 # 容器id
 CID=$(''docker ps | grep "ins" | awk '{print $1}''')
@@ -36,7 +32,7 @@ function run(){
   # mypid=$(netstat -apn|grep 9001|awk '{print $7}'|cut -d/ -f1);
   # echo $mypid
   # kill -9 $mypid
-  docker run -it --name ins -p 8080:8080 -e ACTIVE=$1 -p 9999:9999 --restart=always -v /usr/local/java/insAgency:/ins --mount type=bind,source=/nasData,destination=/nasData -v /usr/local/java/insAgency/logs:/ins/logs -d ins:latest
+  docker run -it --name ins -p 8080:8888 -e "--spring.profiles.active=test" -p 9999:9999 --restart=always -v /usr/local/java/insAgency:/ins --mount type=bind,source=/nasData,destination=/nasData -v /usr/local/java/insAgency/logs:/ins/logs -d ins:latest
 }
 
 #入口