diff options
| author |   Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-08-03 11:50:23 +0200 |
|---|---|---|
| committer | Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-08-03 11:50:23 +0200 |
| commit | 286d4fb6f56a5f0c6afd210b33e6077b7e03607c (patch) | |
| tree | 860a1745ccc3631e772b880b456e8d23dd03cd63 | |
| parent | e688b54db7667e9a7a1cd8a0daa682e631c36368 (diff) | |
Re-enable docker build
* re-enable after seed code temporary workaround
* move docker build from package to deploy phase
Change-Id: Ic338247590b019c90cf9241075a255bfaff28c5b
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Issue-ID: DCAEGEN2-653
| -rw-r--r-- | hv-collector-dcae-app-simulator/pom.xml | 2 | ||||
| -rw-r--r-- | hv-collector-main/pom.xml | 2 | ||||
| -rw-r--r-- | hv-collector-xnf-simulator/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 70 |
4 files changed, 35 insertions, 41 deletions
diff --git a/hv-collector-dcae-app-simulator/pom.xml b/hv-collector-dcae-app-simulator/pom.xml index e38e3cd9..bca1dbb9 100644 --- a/hv-collector-dcae-app-simulator/pom.xml +++ b/hv-collector-dcae-app-simulator/pom.xml @@ -71,12 +71,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> </plugin> - <!-- TODO: unskip docker <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> </plugin> - --> </plugins> </build> </profile> diff --git a/hv-collector-main/pom.xml b/hv-collector-main/pom.xml index 1208e15d..e594aeff 100644 --- a/hv-collector-main/pom.xml +++ b/hv-collector-main/pom.xml @@ -72,12 +72,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> </plugin> - <!-- TODO: unskip docker <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> </plugin> - --> </plugins> </build> </profile> diff --git a/hv-collector-xnf-simulator/pom.xml b/hv-collector-xnf-simulator/pom.xml index 29d557a2..a0b927f5 100644 --- a/hv-collector-xnf-simulator/pom.xml +++ b/hv-collector-xnf-simulator/pom.xml @@ -71,12 +71,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> </plugin> - <!-- TODO: unskip docker <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> </plugin> - --> </plugins> </build> </profile> @@ -73,7 +73,7 @@ <skipAnalysis>true</skipAnalysis> <!-- Docker --> - <skipDocker>true</skipDocker> <!-- TODO: unskip docker --> + <skipDocker>false</skipDocker> <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily> <onap.nexus.dockerregistry.release>nexus3.onap.org:10002</onap.nexus.dockerregistry.release> <docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry> @@ -388,19 +388,50 @@ <pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.1.1</version> + <executions> + <execution> + <id>docker-copy-internal-deps</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/libs/internal</outputDirectory> + <includeGroupIds>${project.parent.groupId}</includeGroupIds> + <includeScope>runtime</includeScope> + </configuration> + </execution> + <execution> + <id>docker-copy-external-deps</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/libs/external</outputDirectory> + <excludeGroupIds>${project.parent.groupId}</excludeGroupIds> + <includeScope>runtime</includeScope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <version>0.26.0</version> <executions> <execution> - <id>build-docker-image</id> - <phase>pre-integration-test</phase> + <id>docker-build-image</id> + <phase>deploy</phase> <goals> <goal>build</goal> </goals> </execution> <execution> - <id>push-docker-image</id> + <id>docker-push-image</id> <phase>deploy</phase> <goals> <goal>push</goal> @@ -425,37 +456,6 @@ </images> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.1</version> - <executions> - <execution> - <id>copy-internal-deps</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/libs/internal</outputDirectory> - <includeGroupIds>${project.parent.groupId}</includeGroupIds> - <includeScope>runtime</includeScope> - </configuration> - </execution> - <execution> - <id>copy-external-deps</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/libs/external</outputDirectory> - <excludeGroupIds>${project.parent.groupId}</excludeGroupIds> - <includeScope>runtime</includeScope> - </configuration> - </execution> - </executions> - </plugin> </plugins> </pluginManagement> </build> |