Ver código fonte

修改到docker外运行环境

tags/v1.0.0^2
林万龙 3 anos atrás
pai
commit
7ac60505ae
3 arquivos alterados com 21 adições e 18 exclusões
  1. +19
    -18
      setup_dev.sh
  2. +1
    -0
      src/main/resources/bootstrap-dev.yaml
  3. +1
    -0
      src/main/resources/bootstrap.yaml

+ 19
- 18
setup_dev.sh Ver arquivo

@@ -4,28 +4,28 @@ mvn package -Dmaven.test.skip=true
#image_version=$(date +%Y%m%d%H%M)
image_version=$version

docker cp docker_jenkins:/var/jenkins_home/workspace/dipperpos_service/target/dipperposition.jar /usr/local/dipperposition/dipperposition.jar
#docker stop dipperposition_service || true
#docker rm dipperposition_service || true
#docker cp docker_jenkins:/var/jenkins_home/workspace/dipperpos_service/target/dipperposition.jar
# /usr/local/dipperposition/dipperposition.jar
docker stop dipperposition_service || true
docker rm dipperposition_service || true

# 删除镜像
#docker rmi -f $(docker images | grep telpo/dipperposition_service | awk '{print $3}')
docker rmi -f $(docker images | grep telpo/dipperposition_service | awk '{print $3}')

#docker build . -t telpo/dipperposition_service:$image_version
docker build . -t telpo/dipperposition_service:$image_version

#TODO:推送镜像到私有仓库
#echo '=================开始推送镜像======================='
#docker tag telpo/dipperposition_service:$image_version 139.224.254.18:5000/dipperposition_service:$image_version
#docker push 139.224.254.18:5000/dipperposition_service:$image_version
#echo '=================推送镜像完成======================='
echo '=================开始推送镜像======================='
docker tag telpo/dipperposition_service:$image_version 139.224.254.18:5000/dipperposition_service:$image_version
docker push 139.224.254.18:5000/dipperposition_service:$image_version
echo '=================推送镜像完成======================='

#删除产生的None镜像
#docker rmi -f $(docker images | grep none | awk '{print $3}')
docker rmi -f $(docker images | grep none | awk '{print $3}')
# 查看镜像列表
#docker images
docker images
# 启动容器
#docker run -v /home/data/dipperposition/log:/var/log/dipperposition -d -e active=dev --network host --restart=always
# -p 9011:9011 -p 9012:9012 -p 9013:9013 --name dipperposition_service 139.224.254.18:5000/dipperposition_service:$image_version
docker run -v /home/data/dipperposition/log:/var/log/dipperposition -d -e active=dev --network host --restart=always -p 9011:9011 -p 9012:9012 -p 9013:9013 --name dipperposition_service 139.224.254.18:5000/dipperposition_service:$image_version

#echo "scp ${WORKSPACE} files......begin"
#set passwd "telpo#1234"
@@ -56,9 +56,10 @@ docker cp docker_jenkins:/var/jenkins_home/workspace/dipperpos_service/target/di
#expect eof
#echo "scp ${WORKSPACE} files......end"
# 查看日志
# docker logs dipperposition_service
#docker logs dipperposition_service

echo '=================启动NettyAPP======================='
ps -ef |grep dipperposition |awk '{print $2}'|xargs kill -9
java -jar -Xms256m -Xmx256m -Xss256k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m /usr/local/dipperposition/dipperposition.jar --spring.profiles.active=dev
echo '=================完成NettyAPP启动======================='
#echo '=================启动NettyAPP======================='
#ps -ef |grep dipperposition |awk '{print $2}'|xargs kill -9
#java -jar -Xms256m -Xmx256m -Xss256k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m
# /usr/local/dipperposition/dipperposition.jar --spring.profiles.active=dev
#echo '=================完成NettyAPP启动======================='

+ 1
- 0
src/main/resources/bootstrap-dev.yaml Ver arquivo

@@ -6,4 +6,5 @@ spring:
cloud:
nacos:
config:
server-addr: 172.16.192.26:8848
file-extension: yaml

+ 1
- 0
src/main/resources/bootstrap.yaml Ver arquivo

@@ -10,6 +10,7 @@ spring:
cloud:
nacos:
config:
server-addr: 172.16.192.26:8848
file-extension: yaml
redis:
database: 1


Carregando…
Cancelar
Salvar