aboutsummaryrefslogtreecommitdiffstats
path: root/packages/docker
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-04-05 16:09:32 -0400
committerRob Daugherty <rd472p@att.com>2018-04-05 16:46:28 -0400
commitf58931869ec5bc1e3d9b9697618eec6e8db33dc4 (patch)
tree74ac6aa8a40051eff356c48db21c6b3fcfbc9b8d /packages/docker
parent7c374365b266d93eca8a48a465536b336cbe5207 (diff)
Add docker pull/push registry definitions to pom
Change-Id: If9836a06a89b6061c388e95fd008be7328f90166 Issue-ID: SO-562 Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'packages/docker')
-rw-r--r--packages/docker/pom.xml16
1 files changed, 10 insertions, 6 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index cf3a362229..abab75265a 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -24,6 +24,8 @@
<mso.chef.git.url.suffix.chef.repo>so/chef-repo</mso.chef.git.url.suffix.chef.repo>
<mso.chef.git.url.suffix.chef.config>so/so-config</mso.chef.git.url.suffix.chef.config>
<mso.project.version>${project.version}</mso.project.version>
+ <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+ <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
</properties>
<build>
@@ -100,11 +102,13 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.19.1</version>
<configuration>
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
+ <pullRegistry>${docker.pull.registry}</pullRegistry>
+ <pushRegistry>${docker.push.registry}</pushRegistry>
<images>
<image>
@@ -113,7 +117,7 @@
<build>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.jacoco</dockerFile>
+ <dockerFile>Dockerfile.jacoco</dockerFile>
</build>
</image>
@@ -124,7 +128,7 @@
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.ubuntu-16.04-update</dockerFile>
+ <dockerFile>Dockerfile.ubuntu-16.04-update</dockerFile>
</build>
</image>
@@ -135,7 +139,7 @@
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.wildfly-10</dockerFile>
+ <dockerFile>Dockerfile.wildfly-10</dockerFile>
</build>
</image>
@@ -149,7 +153,7 @@
</tags>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.mso-arquillian</dockerFile>
+ <dockerFile>Dockerfile.mso-arquillian</dockerFile>
</build>
</image>
@@ -163,7 +167,7 @@
</tags>
<cleanup>try</cleanup>
<dockerFileDir>docker-files</dockerFileDir>
- <dockerFile>docker-files/Dockerfile.mso-chef-final</dockerFile>
+ <dockerFile>Dockerfile.mso-chef-final</dockerFile>
<assembly>
<basedir>/</basedir>