diff options
| author |   Murali Mohan Murthy Potham <murali.p@huawei.com> | 2018-02-08 14:21:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-08 14:21:26 +0000 |
| commit | a52976deebff6ff5db86a9c4056af4dde507477a (patch) | |
| tree | 8c12fa3d62f2b21ff0619ab8f8e711525c96183b | |
| parent | 69c983e492e4a89899f4a6b0d90ed8494261e674 (diff) | |
| parent | 18702e090e6e7858a15cb071527149de74ed12b7 (diff) | |
Merge "Proxy settings in pom without switch"
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-postgres/pom.xml | 5 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-refrepo/pom.xml | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml index ef01bc52..e4c8d5ab 100644 --- a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml +++ b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml @@ -67,11 +67,6 @@ </build> </image> </images> - <buildArgs> - <http_proxy>${HTTP_PROXY}</http_proxy> - <https_proxy>${HTTPS_PROXY}</https_proxy> - <no_proxy>localhost,127.0.0.1</no_proxy> - </buildArgs> </configuration> <executions> <execution> diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml index 3272d9f3..347ae06c 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml +++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml @@ -45,7 +45,7 @@ <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.4.11</version> + <version>1.0.0</version> <configuration> <verbose>true</verbose> <imageName>onap/refrepo</imageName> @@ -60,11 +60,6 @@ </includes> </resource> </resources> - <buildArgs> - <http_proxy>${HTTP_PROXY}</http_proxy> - <https_proxy>${HTTPS_PROXY}</https_proxy> - <no_proxy>localhost,127.0.0.1</no_proxy> - </buildArgs> </configuration> <executions> |