From 1d5345f92dbd4aac2b5f68265921bb2529a71b8e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Tue, 27 Oct 2020 14:16:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-uaa/kidgrow-uaa-server/pom.xml | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/kidgrow-uaa/kidgrow-uaa-server/pom.xml b/kidgrow-uaa/kidgrow-uaa-server/pom.xml
index 22112d7..4fd6f53 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/pom.xml
+++ b/kidgrow-uaa/kidgrow-uaa-server/pom.xml
@@ -24,10 +24,21 @@
<groupId>com.kidgrow</groupId>
<artifactId>kidgrow-uaa-biz</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -39,6 +50,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <configuration>
+ <!-- Dockerfile目录指定 -->
+ <dockerfile>Dockerfile</dockerfile>
+ <repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository>
+ <!-- 生成镜像标签 如不指定 默认为latest -->
+ <tag>1.0.10</tag>
+ <!--<tag>${project.version}</tag>-->
+ <buildArgs>
+ <JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE>
+ </buildArgs>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
--
Gitblit v1.8.0