bridge 2 лет назад
Родитель
Сommit
104db397d7
3 измененных файлов с 43 добавлено и 9 удалено
  1. 1 1
      .drone.yml
  2. 3 8
      pom.xml
  3. 39 0
      screen.yml

+ 1 - 1
.drone.yml

@@ -16,7 +16,7 @@ steps:
     image: jaikuai/npm-mvn
     pull: true
     commands:
-      - mvn clean install -Dmaven.test.skip=true -Dmaven.repo.local=/drone/src/.m2/repository -Dmaven.compile.fork=true package
+      - mvn clean install -Dmaven.test.skip=true -Dmaven.repo.local=/drone/src/.m2/repository -Dmaven.compile.fork=true repackage
 
   - name: rebuild-cache
     image: drillster/drone-volume-cache

+ 3 - 8
pom.xml

@@ -11,6 +11,7 @@
     <groupId>com.dashboard</groupId>
     <artifactId>dashboard</artifactId>
     <version>1.0.1</version>
+    <packaging>jar</packaging>
     <name>omes-dashboard</name>
     <description>omes-dashboard</description>
     <properties>
@@ -150,14 +151,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

+ 39 - 0
screen.yml

@@ -0,0 +1,39 @@
+version: "3.7"
+services:
+  mysql:
+    hostname: mysql
+    image: mysql:5
+    networks:
+      - screen
+    environment:
+      - MYSQL_ROOT_PASSWORD=Qx123456
+    ports:
+      - 3306:3306
+  redis:
+    hostname: redis
+    image: rpi.it5000.com:5000/redis
+    networks:
+      - screen
+  api-server:
+    image: nas.fast-fun.cn:5000/screen/omes-api:1.0.2
+    environment:
+      - PRO_ENV=prod
+    networks:
+      - screen
+    depends_on:
+      - redis
+      - mysql
+  omes-screen:
+    image: nas.fast-fun.cn:5000/screen/omes-screen:1.0.3
+    ports:
+      - 80:80
+    networks:
+      - screen
+    depends_on:
+      - api-server
+  zk-screen:
+    image: nas.fast-fun.cn:5000/screen/zk-screen:1.0.2
+    networks:
+      - screen
+networks:
+    screen: