summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogumil Zebek <bogumil.zebek@nokia.com>2020-04-02 18:32:39 +0200
committerZebek Bogumil <bogumil.zebek@nokia.com>2020-04-02 18:44:22 +0200
commit5ff7ee49fdc6ae66b1ff2bbe581079a49a114ae0 (patch)
tree5e1bcc49e54b7ffee97196601bdd2d35cfae7c48
parentce294fc3e7ad041aa0d197f7ba255b97a1aec820 (diff)
Configure spotify docker plugin1.5.21.5.1
Change spotify docker plugin execution triggers from deploy to package. Issue-ID: VNFSDK-569 Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com> Change-Id: I8b835f1506d94e9d2a321d4eeac5afeac1f53073
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/pom.xml159
1 files changed, 64 insertions, 95 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
index 0378751a..c181243c 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
@@ -34,112 +34,81 @@
<properties>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
- <docker.push.registry></docker.push.registry>
- <skip.docker.build>true</skip.docker.build>
- <skip.docker.tag>true</skip.docker.tag>
- <skip.docker.push>true</skip.docker.push>
+ <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
<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>
- <plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>1.0.0</version>
- <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>${onap.nexus.dockerregistry.daily}</serverId>
- <dockerDirectory>${basedir}/src/main/docker</dockerDirectory>
- <resources>
- <resource>
- <targetPath>/STAGE</targetPath>
- <directory>${basedir}/../../zip/target/deployunzip</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- <executions>
- <execution>
- <id>build-image</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- <configuration>
- <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
- </configuration>
- </execution>
- <execution>
- <id>tag-image-timestamped-version</id>
- <phase>deploy</phase>
- <goals>
- <goal>tag</goal>
- </goals>
- <configuration>
- <image>onap/vnfsdk/refrepo</image>
- <newName>${docker.push.registry}/onap/vnfsdk/refrepo:${project.version}-${maven.build.timestamp}</newName>
- <pushImage>${skip.docker.push}</pushImage>
- <skipDockerTag>${skip.docker.tag}</skipDockerTag>
- </configuration>
- </execution>
- <execution>
- <id>tag-image-latest-version</id>
- <phase>deploy</phase>
- <goals>
- <goal>tag</goal>
- </goals>
- <configuration>
- <image>onap/vnfsdk/refrepo</image>
- <newName>${docker.push.registry}/onap/vnfsdk/refrepo:latest</newName>
- <pushImage>${skip.docker.push}</pushImage>
- <skipDockerTag>${skip.docker.tag}</skipDockerTag>
- </configuration>
- </execution>
-
- </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>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <verbose>true</verbose>
+ <imageName>onap/vnfsdk/refrepo</imageName>
+ <noCache>${docker.noCache}</noCache>
+ <serverId>${onap.nexus.dockerregistry.daily}</serverId>
+ <dockerDirectory>${basedir}/src/main/docker</dockerDirectory>
+ <resources>
+ <resource>
+ <targetPath>/STAGE</targetPath>
+ <directory>${basedir}/../../zip/target/deployunzip</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>build-image</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <configuration>
+ <skipDockerBuild>false</skipDockerBuild>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-image-timestamped-version</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <image>onap/vnfsdk/refrepo</image>
+ <newName>${docker.push.registry}/onap/vnfsdk/refrepo:${project.version}-${maven.build.timestamp}</newName>
+ <pushImage>true</pushImage>
+ <skipDockerTag>false</skipDockerTag>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-image-latest-version</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <image>onap/vnfsdk/refrepo</image>
+ <newName>${docker.push.registry}/onap/vnfsdk/refrepo:latest</newName>
+ <pushImage>true</pushImage>
+ <skipDockerTag>false</skipDockerTag>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
</build>
</profile>
</profiles>