aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2019-03-26 12:44:59 -0400
committerAlexis de Talhouët <adetalhouet89@gmail.com>2019-03-26 17:37:31 +0000
commita298b9eeec90e7eb4499751ef17e8cc9f9d65111 (patch)
treedfa5641504c5bd82b2c6680c3fc5569be68ad0aa
parent4aee3138b446163fe45d4a92758e16068132ac41 (diff)
Fix cds ui build
Change-Id: I0ce7472367348f044ef81f49613876083a2332ff Issue-ID: CCSDK-1177 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
-rw-r--r--cds-ui/application/.dockerignore (renamed from cds-ui/.dockerignore)0
-rw-r--r--cds-ui/application/Dockerfile (renamed from cds-ui/Dockerfile)0
-rw-r--r--cds-ui/application/pom.xml3
-rw-r--r--pom.xml6
4 files changed, 4 insertions, 5 deletions
diff --git a/cds-ui/.dockerignore b/cds-ui/application/.dockerignore
index 00137e31f..00137e31f 100644
--- a/cds-ui/.dockerignore
+++ b/cds-ui/application/.dockerignore
diff --git a/cds-ui/Dockerfile b/cds-ui/application/Dockerfile
index 5bf65f428..5bf65f428 100644
--- a/cds-ui/Dockerfile
+++ b/cds-ui/application/Dockerfile
diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml
index 842655934..3ab1d338b 100644
--- a/cds-ui/application/pom.xml
+++ b/cds-ui/application/pom.xml
@@ -56,7 +56,7 @@ limitations under the License.
<goal>execute</goal>
</goals>
<configuration>
- <source>../TagVersion.groovy</source>
+ <source>${project.basedir}/../../TagVersion.groovy</source>
</configuration>
</execution>
</executions>
@@ -80,7 +80,6 @@ limitations under the License.
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>..</dockerFileDir>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
diff --git a/pom.xml b/pom.xml
index e229fa98a..8c989ba09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,9 @@ limitations under the License.
<description>CCSDK Controller Design Studio</description>
<modules>
- <!--<module>cds-ui</module>-->
- <module>components</module>
- <module>ms</module>
+ <module>cds-ui</module>
+ <!--<module>components</module>-->
+ <!--<module>ms</module>-->
</modules>
<url>https://wiki.onap.org</url>