diff options
| author |   Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-09-06 08:20:03 +0200 |
|---|---|---|
| committer | Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-09-06 09:41:53 +0200 |
| commit | b20f963b6bafa0a0a5acfac3f2c802e5539b5068 (patch) | |
| tree | 954636589ce62f9351aa50a082ce1e560908ad81 /pom.xml | |
| parent | d6f5bfa934b9aa0571e853fc5432ab84eceb9db1 (diff) | |
Build enhancements
* Handling docker proxy configuration in a reasonable way
* Should skip coverage verification when skipTests was set
* Get rid of resources encoding warning
* Fix check-coverage output on Jenkins
Change-Id: If828fc41a88074931649e739c615a8b9d8db8739
Issue-ID: DCAEGEN2-755
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -363,6 +363,20 @@ <profiles> <profile> + <id>docker-proxy</id> + <activation> + <property> + <name>docker.http_proxy</name> + </property> + </activation> + <properties> + <!-- set build args as defined in https://dmp.fabric8.io/#build-buildargs --> + <docker.buildArg.http_proxy>${docker.http_proxy}</docker.buildArg.http_proxy> + <docker.buildArg.https_proxy>${docker.http_proxy}</docker.buildArg.https_proxy> + </properties> + </profile> + + <profile> <id>docker</id> <activation> <property> @@ -439,13 +453,6 @@ </name> <registry>${docker-image.registry}</registry> <build> - <!-- - <args> - <http_proxy>${docker.http_proxy}</http_proxy> - <https_proxy>${docker.http_proxy}</https_proxy> - </args> - --> - <dockerFileDir>${project.basedir}</dockerFileDir> <tags> <tag>${project.version}-${maven.build.timestamp}Z</tag> |