summaryrefslogtreecommitdiffstats
path: root/packages/docker
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2020-05-29 19:35:12 +0000
committerGerrit Code Review <gerrit@onap.org>2020-05-29 19:35:12 +0000
commit071905b47891738b4609e7ca2848228fb3f3202d (patch)
tree62a42763e6b7fc00b50348d9b2e4e0c4c58cab42 /packages/docker
parentdf74daf492f6c7293ff3b31b0aa99342a8e0295b (diff)
parent617dd58d76d8182ed414659a3dca8609153ff3ee (diff)
Merge "Override global maven configuration"
Diffstat (limited to 'packages/docker')
-rw-r--r--packages/docker/pom.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 217a5fdb5c..1862bd15ff 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -65,13 +65,11 @@
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.31.0</version>
-
- <configuration>
+ <configuration combine.self="override">
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<pullRegistry>${docker.pull.registry}</pullRegistry>
<pushRegistry>${docker.push.registry}</pushRegistry>
-
<images>
<image>
<name>${docker.image.prefix}/base-image:1.0</name>