From b9114338ab52ac2adca26983d3b2d633326deb0e Mon Sep 17 00:00:00 2001
From: z7658329 <1043706593@qq.com>
Date: Mon, 31 Oct 2022 12:39:16 +0800
Subject: [PATCH 1/2] fix parent artifactId env
---
hugegraph-hubble/hubble-dist/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hugegraph-hubble/hubble-dist/pom.xml b/hugegraph-hubble/hubble-dist/pom.xml
index 31a216de1..8de78850e 100644
--- a/hugegraph-hubble/hubble-dist/pom.xml
+++ b/hugegraph-hubble/hubble-dist/pom.xml
@@ -125,9 +125,9 @@
build
--no-cache
-t
- ${docker.hub}/${project.parent.artifactId}:${docker.tag}
+ ${docker.hub}/${parent.artifactId}:${docker.tag}
-t
- ${docker.hub}/${project.parent.artifactId}:latest
+ ${docker.hub}/${parent.artifactId}:latest
${project.basedir}
--file=../Dockerfile
@@ -154,9 +154,9 @@
--no-cache
--push
-t
- ${docker.hub}/${project.parent.artifactId}:${docker.tag}
+ ${docker.hub}/${parent.artifactId}:${docker.tag}
-t
- ${docker.hub}/${project.parent.artifactId}:latest
+ ${docker.hub}/${parent.artifactId}:latest
${project.basedir}
--file=../Dockerfile
From 82378bb73bd3ce4aeac0d826a06ef5b4b1e6f6da Mon Sep 17 00:00:00 2001
From: z7658329 <1043706593@qq.com>
Date: Mon, 31 Oct 2022 14:47:37 +0800
Subject: [PATCH 2/2] fix parent artifactId env v2
---
hugegraph-hubble/hubble-dist/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hugegraph-hubble/hubble-dist/pom.xml b/hugegraph-hubble/hubble-dist/pom.xml
index 8de78850e..3ffc38c90 100644
--- a/hugegraph-hubble/hubble-dist/pom.xml
+++ b/hugegraph-hubble/hubble-dist/pom.xml
@@ -14,12 +14,12 @@
${project.parent.artifactId}
${release.name}-${project.version}
- ${project.parent.basedir}
+ ${project.basedir}/..
${project.basedir}
${current.basedir}/assembly
${assembly.dir}/descriptor
${assembly.dir}/static
- ${project.parent.basedir}/hubble-fe
+ ${project.basedir}/../hubble-fe
@@ -125,9 +125,9 @@
build
--no-cache
-t
- ${docker.hub}/${parent.artifactId}:${docker.tag}
+ ${docker.hub}/${top.level.dir}:${docker.tag}
-t
- ${docker.hub}/${parent.artifactId}:latest
+ ${docker.hub}/${top.level.dir}:latest
${project.basedir}
--file=../Dockerfile
@@ -154,9 +154,9 @@
--no-cache
--push
-t
- ${docker.hub}/${parent.artifactId}:${docker.tag}
+ ${docker.hub}/${top.level.dir}:${docker.tag}
-t
- ${docker.hub}/${parent.artifactId}:latest
+ ${docker.hub}/${top.level.dir}:latest
${project.basedir}
--file=../Dockerfile