From 69effd094b19c374ec97ee5bf8d07c8d784e35a7 Mon Sep 17 00:00:00 2001
From: huanghaiquan <huanghaiquan@jd.com>
Date: Tue, 17 Nov 2020 23:44:05 +0800
Subject: [PATCH] fixed compilation error related to the deploy-docker;

---
 deploy/docker/docker-demo/pom.xml | 9 +++++----
 deploy/docker/docker-sdk/pom.xml  | 2 +-
 deploy/docker/pom.xml             | 6 +-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/deploy/docker/docker-demo/pom.xml b/deploy/docker/docker-demo/pom.xml
index a6b6ef36..c222c23e 100644
--- a/deploy/docker/docker-demo/pom.xml
+++ b/deploy/docker/docker-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>docker</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.3.0.RELEASE</version>
+        <version>1.4.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>docker-demo</artifactId>
@@ -24,7 +24,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -123,9 +122,11 @@
                 <configuration>
 
                     <imageName>jdchain-demo</imageName>
-                    <imageTags>${docker.tag}</imageTags>
+                    <imageTags>
+                    	<imageTag>${project.version}</imageTag>
+                    </imageTags>
                     <!-- 指定 Dockerfile 路径-->
-                    <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+                    <dockerDirectory>${project.basedir}/src/main/target</dockerDirectory>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/deploy/docker/docker-sdk/pom.xml b/deploy/docker/docker-sdk/pom.xml
index acd99c8c..276d48c4 100644
--- a/deploy/docker/docker-sdk/pom.xml
+++ b/deploy/docker/docker-sdk/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>docker</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.3.0.RELEASE</version>
+        <version>1.4.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/deploy/docker/pom.xml b/deploy/docker/pom.xml
index 81a492ab..6c6e1dab 100644
--- a/deploy/docker/pom.xml
+++ b/deploy/docker/pom.xml
@@ -5,17 +5,13 @@
     <parent>
         <artifactId>deploy-root</artifactId>
         <groupId>com.jd.blockchain</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.0.RELEASE</version>
     <packaging>pom</packaging>
 
     <artifactId>docker</artifactId>
 
-    <properties>
-        <docker.tag>1.3.0</docker.tag>
-    </properties>
 
     <modules>
         <module>docker-sdk</module>