修改发布文件

deploy/prod/upload.sh

+#!/bin/bash
+
+cp ../../eureka/target/*.jar winsun-docker-application-list/eureka/
+cp ../../gateway/target/*.jar winsun-docker-application-list/gateway/
+cp ../../core-service/target/*.jar winsun-docker-application-list/core/
+
+cp ../../apply-net/target/*.jar winsun-docker-application-list/gdtel-gztel-school-center/applynet/
+cp ../../service-manager/target/*.jar winsun-docker-application-list/gdtel-gztel-school-center/manager/
+cp ../../new-user/target/*.jar winsun-docker-application-list/gdtel-gztel-school-center/newuser/
+cp ../../old-user/target/*.jar winsun-docker-application-list/gdtel-gztel-school-center/olduser/
+cp ../../task/target/*.jar winsun-docker-application-list/gdtel-gztel-school-center/task/
+
+# scp -r prod/winsun-docker-application-list/eureka/eureka.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/eureka/eureka.jar
+# scp -r prod/winsun-docker-application-list/gateway/gateway.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/gateway/gateway.jar
+# scp -r prod/winsun-docker-application-list/core/core.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/core/core.jar
+# scp -r prod/winsun-docker-application-list/ liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list
+scp -r winsun-docker-application-list/gdtel-gztel-school-center/* liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/gdtel-gztel-school-center/
+

deploy/prod/winsun-docker-application-list/docker-compose.yml

@@ -11,14 +11,25 @@ services:
     container_name: redis
     ports:
       - "6379:6379"
+  es:
+    image: elasticsearch
+    container_name: es
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    environment:
+      - "discovery.type=single-node"
+    deploy:
+      resources:
+        limits:
+          memory: 4G
+        reservations:
+          memory: 1G
   eureka:
     image: eureka
     container_name: eureka
     ports:
       - "20000:20000"
-    build:
-      context: eureka/
-      dockerfile: Dockerfile
     depends_on:
       - rabbitmq
     deploy:
@@ -32,9 +43,6 @@ services:
     container_name: gateway
     ports:
       - "10001:10001"
-    build:
-      context: gateway/
-      dockerfile: Dockerfile
     depends_on:
       - rabbitmq
       - eureka
@@ -47,9 +55,6 @@ services:
   core:
     image: core
     container_name: core
-    build:
-      context: core/
-      dockerfile: Dockerfile
     ports:
       - "10002:10002"
     depends_on:
@@ -64,9 +69,6 @@ services:
   gdtelgztelschoolcentermanager:
     image: gdtelgztelschoolcentermanager
     container_name: gdtelgztelschoolcentermanager
-    build:
-      context: gdtel-gztel-school-center/manager/
-      dockerfile: Dockerfile
     ports:
       - "11091:11091"
     depends_on:
@@ -83,9 +85,6 @@ services:
   gdtelgztelschoolcentertask:
     image: gdtelgztelschoolcentertask
     container_name: gdtelgztelschoolcentertask
-    build:
-      context: gdtel-gztel-school-center/task/
-      dockerfile: Dockerfile
     ports:
       - "11191:11191"
       - "8199:8199"
@@ -103,9 +102,6 @@ services:
   gdtelgztelschoolcenterapplynet:
     image: gdtelgztelschoolcenterapplynet
     container_name: gdtelgztelschoolcenterapplynet
-    build:
-      context: gdtel-gztel-school-center/applynet/
-      dockerfile: Dockerfile
     ports:
       - "11092:11092"
     depends_on:
@@ -122,9 +118,6 @@ services:
   gdtelgztelschoolcenternewuser:
     image: gdtelgztelschoolcenternewuser
     container_name: gdtelgztelschoolcenternewuser
-    build:
-      context: gdtel-gztel-school-center/newuser/
-      dockerfile: Dockerfile
     ports:
       - "11093:11093"
     depends_on:
@@ -141,9 +134,6 @@ services:
   gdtelgztelschoolcenterolduser:
     image: gdtelgztelschoolcenterolduser
     container_name: gdtelgztelschoolcenterolduser
-    build:
-      context: gdtel-gztel-school-center/olduser/
-      dockerfile: Dockerfile
     ports:
       - "11094:11094"
     depends_on:
@@ -160,9 +150,6 @@ services:
   gdtelgztelschoolcenterui:
     image: gdtelgztelschoolcenterui
     container_name: gdtelgztelschoolcenterui
-    build:
-      context: gdtel-gztel-school-center/ui/
-      dockerfile: Dockerfile
     ports:
       - "11090:11090"
     depends_on:
@@ -180,9 +167,6 @@ services:
   winsunoaui:
     image: winsunoaui
     container_name: winsunoaui
-    build:
-      context: winsun-oa/ui/
-      dockerfile: Dockerfile
     ports:
       - "11080:11080"
     depends_on:
@@ -202,9 +186,6 @@ services:
     container_name: winsunoareport
     ports:
       - "10003:10003"
-    build:
-      context: winsun-oa/report/
-      dockerfile: Dockerfile
     depends_on:
       - rabbitmq
       - redis

deploy/upload.sh

-#!/bin/bash
-
-cp ../eureka/target/*.jar prod/winsun-docker-application-list/eureka/
-cp ../gateway/target/*.jar prod/winsun-docker-application-list/gateway/
-cp ../core-service/target/*.jar prod/winsun-docker-application-list/core/
-
-cp ../apply-net/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/applynet/
-cp ../service-manager/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/manager/
-cp ../new-user/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/newuser/
-cp ../old-user/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/olduser/
-cp ../renewal-user/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/renewaluser/
-cp ../task/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/task/
-
-# scp -r prod/winsun-docker-application-list/eureka/eureka.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/eureka/eureka.jar
-# scp -r prod/winsun-docker-application-list/gateway/gateway.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/gateway/gateway.jar
-# scp -r prod/winsun-docker-application-list/core/core.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/core/core.jar
-# scp -r prod/winsun-docker-application-list/ liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list
-scp -r prod/winsun-docker-application-list/gdtel-gztel-school-center/* liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/gdtel-gztel-school-center/
-