Merge remote-tracking branch 'origin/master'

Dockerfile

@@ -5,12 +5,13 @@ VOLUME /tmp
 #容器使用端口
 EXPOSE 8000
 #添加jar包入容器
-ADD ./apply/apply-service/target/apply-service-0.0.1.jar /apply.jar
-ADD ./assessment/assessment-service/target/assessment-service-0.0.1.jar /assessment.jar
-ADD ./auth-service/target/auth-0.0.1.jar /auth.jar
-ADD ./gateway-service/target/gateway-0.0.1.jar /gateway.jar
-ADD ./governance/target/governance-0.0.1.jar /governance.jar
-ADD ./system/system-admin-service/target/system-admin-0.0.1.jar /system-admin.jar
+ADD ./jar/apply-service-0.0.1.jar /apply.jar
+ADD ./jar/assessment-service-0.0.1.jar /assessment.jar
+ADD ./jar/auth-0.0.1.jar /auth.jar
+ADD ./jar/gateway-0.0.1.jar /gateway.jar
+ADD ./jar/governance-0.0.1.jar /governance.jar
+ADD ./jar/system-admin-0.0.1.jar /system-admin.jar
+ADD ./jar/account-service-0.0.1.jar /account.jar
 ADD start.sh /start.sh
 RUN chmod +x /start.sh
 

Dockerfile1

+#指定依赖的镜像
+FROM java:8
+#springboot
+VOLUME /tmp
+#容器使用端口
+EXPOSE 8000
+#添加jar包入容器
+ADD ./apply/apply-service/target/apply-service-0.0.1.jar /apply.jar
+ADD ./assessment/assessment-service/target/assessment-service-0.0.1.jar /assessment.jar
+ADD ./auth-service/target/auth-0.0.1.jar /auth.jar
+ADD ./gateway-service/target/gateway-0.0.1.jar /gateway.jar
+ADD ./governance/target/governance-0.0.1.jar /governance.jar
+ADD ./system/system-admin-service/target/system-admin-0.0.1.jar /system-admin.jar
+ADD ./account/account-service/target/account-service-0.0.1.jar /account.jar
+ADD start.sh /start.sh
+RUN chmod +x /start.sh
+
+ENTRYPOINT ["sh","-c","./start.sh"]
+

run.sh

@@ -5,6 +5,7 @@ git pull
 mvn install
 
 docker stop ltc-poc
+docker rm ltc-poc
 docker rmi ltc:latest
 docker build -t ltc .
-docker run -d --name ltc-poc -p 9999:8001 -m 2G  ltc
+docker run -d -v /projects/logs/:/logs/ --name ltc-poc -p 9999:8001 -m 6G  ltc

start.sh

 #!/bin/bash
 mkdir logs
-nohup java -Xms50m -Xmx200m -jar /auth.jar >./logs/auth.log  &
-nohup java -Xms50m -Xmx200m -jar /system-admin.jar >./logs/admin.log &
-nohup java -Xms50m -Xmx200m -jar /gateway.jar >./logs/gateway.log &
-nohup java -Xms50m -Xmx200m -jar /apply.jar >./logs/apply.log &
-nohup java -Xms50m -Xmx200m -jar /governance.jar >./logs/govwenanc.log &
-nohup java -Xms50m -Xmx200m -jar /assessment.jar >./logs/assessment.log &
-
+nohup java -Xms50m -Xmx512m -jar /auth.jar >./logs/auth.log  &
+nohup java -Xms50m -Xmx512m -jar /system-admin.jar >./logs/admin.log &
+nohup java -Xms50m -Xmx512m -jar /gateway.jar >./logs/gateway.log &
+nohup java -Xms50m -Xmx512m -jar /apply.jar >./logs/apply.log &
+nohup java -Xms50m -Xmx512m -jar /governance.jar >./logs/govwenanc.log &
+nohup java -Xms50m -Xmx512m -jar /assessment.jar >./logs/assessment.log &
+nohup java -Xms50m -Xmx512m -jar /account.jar >./logs/account.log &
 
 while [[ true ]]; do
 
 sleep 1
 
 done
+