diff options
| author |   Bogumil Zebek <bogumil.zebek@nokia.com> | 2020-04-01 12:51:30 +0200 |
|---|---|---|
| committer | Zebek Bogumil <bogumil.zebek@nokia.com> | 2020-04-01 12:52:34 +0200 |
| commit | ce294fc3e7ad041aa0d197f7ba255b97a1aec820 (patch) | |
| tree | 9590253f0c1a3696e69c7539cd5a6d3abb59f60a | |
| parent | 20e20a90439d2c1a853b188200ee419edeb6e4a5 (diff) | |
Fix refrepo image building
Issue-ID: VNFSDK-569
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Change-Id: Ib59b2cfeff0f1a8150dfb32473f0080f962a0a3d
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | pom.xml | 9 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-refrepo/pom.xml | 39 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/zip/pom.xml | 8 | ||||
| -rw-r--r-- | vnfmarket-be/vnf-sdk-marketplace/pom.xml | 6 |
5 files changed, 65 insertions, 5 deletions
@@ -33,6 +33,10 @@ A platform to automate and manage different kind of VNF test cases for given VNF - Provide integration with OPNFV dovetail to run test cases across dovetail and ONAP VNFSDK. - Uses Open CLI Platform (OCLIP) for developing, testing, deploying and executing test cases - Available as docker container. +- More details at <https://onap.readthedocs.io/en/latest/submodules/vnfsdk/model.git/docs/index.html>` - -- `More details <https://onap.readthedocs.io/en/latest/submodules/vnfsdk/model.git/docs/index.html>`_
\ No newline at end of file +Docker image building +===================== +``` + mvn clean package -Pdocker +``` @@ -73,5 +73,14 @@ </plugins> </build> + + <profiles> + <profile> + <id>docker</id> + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + </profile> + </profiles> </project> diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml index 9d8ed8b4..0378751a 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml +++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml @@ -41,6 +41,7 @@ <docker.skip>false</docker.skip> <docker.noCache>true</docker.noCache> <docker.skip.build>false</docker.skip.build> + <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily> </properties> <build> @@ -52,8 +53,13 @@ <configuration> <verbose>true</verbose> <imageName>onap/vnfsdk/refrepo</imageName> + <imageTags> + <imageTag>${project.version}-${maven.build.timestamp}Z</imageTag> + <imageTag>${project.version}</imageTag> + <imageTag>latest</imageTag> + </imageTags> <noCache>${docker.noCache}</noCache> - <serverId>docker-hub</serverId> + <serverId>${onap.nexus.dockerregistry.daily}</serverId> <dockerDirectory>${basedir}/src/main/docker</dockerDirectory> <resources> <resource> @@ -106,8 +112,35 @@ </executions> </plugin> - - </plugins> </build> + <profiles> + <profile> + <id>docker</id> + <build> + <defaultGoal>package</defaultGoal> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>mvn</executable> + <arguments> + <argument>package</argument> + <argument>docker:build</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/vnfmarket-be/deployment/zip/pom.xml b/vnfmarket-be/deployment/zip/pom.xml index 73703691..78a9709c 100644 --- a/vnfmarket-be/deployment/zip/pom.xml +++ b/vnfmarket-be/deployment/zip/pom.xml @@ -123,4 +123,12 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>docker</id> + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + </profile> + </profiles> </project> diff --git a/vnfmarket-be/vnf-sdk-marketplace/pom.xml b/vnfmarket-be/vnf-sdk-marketplace/pom.xml index 498da6b0..6c3ae9fa 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/pom.xml +++ b/vnfmarket-be/vnf-sdk-marketplace/pom.xml @@ -247,6 +247,12 @@ due to Security Issues:- CVE-2019-10241,CVE-2019-10247,CVE-2019-10246 <skip.unit.tests>false</skip.unit.tests> </properties> </profile> + <profile> + <id>docker</id> + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + </profile> </profiles> <build> <finalName>ROOT</finalName> |