diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-01-31 14:10:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-01-31 14:10:49 +0000 |
| commit | 72d081256d30e5591a21298d117810062eadfd3d (patch) | |
| tree | deacf1e99adc58f4c4c3427847717c3ec634e8a2 /ansible-server/pom.xml | |
| parent | dbc7a4ded01499f590e48d565152d5dc06a2aa82 (diff) | |
| parent | 1bc5690a09462237d48e5ed409e985597681898f (diff) | |
Merge "reduce ccsdk-ansible-server image footprint"
Diffstat (limited to 'ansible-server/pom.xml')
| -rw-r--r-- | ansible-server/pom.xml | 71 |
1 files changed, 6 insertions, 65 deletions
diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 29b5e639..cccc7d04 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> + <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>1.2.1-SNAPSHOT</version> </parent> + <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.onap.ccsdk.distribution</groupId> @@ -18,7 +19,7 @@ <properties> <image.name>onap/ccsdk-ansible-server-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version> + <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> @@ -71,49 +72,9 @@ <outputDirectory>${basedir}/target/docker-stage</outputDirectory> <resources> <resource> - <directory>src/main/docker</directory> - <includes> - <include>Dockerfile</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - - <execution> - <id>copy-scripts</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk</outputDirectory> - <resources> - <resource> - <directory>src/main/scripts</directory> - <includes> - <include>*</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - - <execution> - <id>copy-yml</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/Playbooks</outputDirectory> - <resources> - <resource> - <directory>src/main/yml</directory> + <directory>src/main</directory> <includes> - <include>*</include> + <include>**/*</include> </includes> <filtering>false</filtering> </resource> @@ -137,7 +98,7 @@ <configuration> <executable>/usr/bin/find</executable> <arguments> - <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> + <argument>${basedir}/target/docker-stage/ansible-server</argument> <argument>-name</argument> <argument>*.py</argument> <argument>-exec</argument> @@ -148,26 +109,6 @@ </arguments> </configuration> </execution> - <execution> - <id>change shell permissions</id> - <phase>process-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/find</executable> - <arguments> - <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> - <argument>-name</argument> - <argument>*.sh</argument> - <argument>-exec</argument> - <argument>chmod</argument> - <argument>+x</argument> - <argument>{}</argument> - <argument>;</argument> - </arguments> - </configuration> - </execution> </executions> </plugin> </plugins> |