diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2019-02-09 18:33:55 -0500 |
|---|---|---|
| committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2019-02-12 13:02:59 -0500 |
| commit | 91162610de8efaa9c0bfd73ff99fcabe0ef23e8a (patch) | |
| tree | 9300ec6ecba33b570812a856ca2b6955d8d268af /ms/controllerblueprints/distribution/src/main/docker/distribution.xml | |
| parent | 702a59b0ac36cfdd9eed43e539f953f5277877eb (diff) | |
Multiple fixes & enhancement
- Rework docker image build
- Fix compress function
- Fix node type name for source-primary-db
Change-Id: Ide38e17036e76047d9f850b714ba0da4add5cd9d
Issue-ID: CCSDK-414
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'ms/controllerblueprints/distribution/src/main/docker/distribution.xml')
| -rwxr-xr-x | ms/controllerblueprints/distribution/src/main/docker/distribution.xml | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml index 1555b43e..74dc4400 100755 --- a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml +++ b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml @@ -17,8 +17,8 @@ --> <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> <!-- create a tar.gz file containing the projects dependencies --> <id>${assembly.id}</id> <formats> @@ -27,8 +27,6 @@ <dependencySets> <dependencySet> <outputDirectory>/opt/app/onap/lib</outputDirectory> - <excludes> - </excludes> </dependencySet> </dependencySets> <fileSets> @@ -36,38 +34,18 @@ <directory>${project.basedir}/../application/src/main/resources</directory> <includes> <include>application.properties</include> + <include>logback.xml</include> </includes> - <outputDirectory>./</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/docker</directory> - <includes> - <include>Dockerfile</include> - <include>startService.sh</include> - </includes> - <outputDirectory>./</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../application/src/main/resources</directory> - <outputDirectory>src/main/resources</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../application/etc</directory> - <outputDirectory>./etc</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/../application/opt/app/onap/config</directory> - <outputDirectory>./config</outputDirectory> + <outputDirectory>/opt/app/onap/config</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> </fileSet> <fileSet> <directory>${project.basedir}/../../../components/model-catalog</directory> - <outputDirectory>./model-catalog</outputDirectory> + <outputDirectory>/opt/app/onap/model-catalog</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <exclude>${project.basedir}/../../../components/model-catalog/proto-definition</exclude> + </excludes> </fileSet> </fileSets> </assembly> |