diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-03-27 19:55:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-27 19:55:05 +0000 |
| commit | 28153002ca2548bf3e67b3bdf8d9e2efde5f89a6 (patch) | |
| tree | e11946cd0374b21cdaaf384c4ccab98afe0cd033 | |
| parent | 59d6b816c3ccb9cb392630456ad3746ec99b730f (diff) | |
| parent | a298b9eeec90e7eb4499751ef17e8cc9f9d65111 (diff) | |
Merge "Fix cds ui build"
| -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.xml | 3 | ||||
| -rw-r--r-- | pom.xml | 6 |
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> @@ -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> |