summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoufenghu <[email protected]>2019-12-23 18:51:31 +0800
committerdoufenghu <[email protected]>2019-12-23 18:51:31 +0800
commita51f543b58325bd9fc13fc23b24802e64a6eabde (patch)
tree9844c63baf5de6f1e15b275663d2ef3b9ef8c457
parent9627f2004cf467dcb577c2523ff662d05b476266 (diff)
自动构建目录重构v3.0.191223-rc0
-rw-r--r--docker/Dockerfile2
-rw-r--r--pom.xml6
2 files changed, 3 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 060c73d1..28d85213 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM ${JDK_IMAGE}
MAINTAINER Galaxy
VOLUME /tmp
WORKDIR /home/tsg/galaxy/galaxy-qgw-service
-COPY ../config config
+COPY config config
ARG JAR_FILE
COPY ${JAR_FILE} galaxy-qgw-service.jar
#dockercompose set JAVA_OPTS
diff --git a/pom.xml b/pom.xml
index a56fba11..b40d4694 100644
--- a/pom.xml
+++ b/pom.xml
@@ -351,13 +351,11 @@
<serverId>153-docker-repo</serverId>
<registryUrl>${docker.registry}:${docker.registry.port}</registryUrl>
<!--是否向镜像registry(harbor)中推送镜像,如果为false则需要在mvn命令时添加-DpushImage参数-->
- <pushImage>false</pushImage>
+ <pushImage>true</pushImage>
<imageName>${docker.registry}:${docker.registry.port}/${docker.image.prefix}/${project.artifactId}</imageName>
<forceTags>true</forceTags>
-
-
<!--远程docker构建,供dockerfile使用-->
<dockerHost>http://192.168.40.153:2375</dockerHost>
<dockerDirectory>docker</dockerDirectory>
@@ -377,7 +375,7 @@
<resource>
<targetPath>/config</targetPath>
- <directory>${project.build.directory}/classes/config</directory>
+ <directory>config</directory>
</resource>