diff options
| author |   Dan Timoney <dtimoney@att.com> | 2024-07-19 18:53:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2024-07-19 18:53:07 +0000 |
| commit | 168c8a13e0780dcad5eaed720a5700d9e343dacc (patch) | |
| tree | b501cbfaefe1f84122a273fa7bf46e74ad5e5d93 | |
| parent | f5b96156682cc308039eb9a5ba007c9308c22c67 (diff) | |
| parent | cd21961c51bec19e91003d41d7f10bd5f776e747 (diff) | |
Merge "Update versions for New Delhi"newdelhi
| -rw-r--r-- | alpine/java17/src/main/docker/Dockerfile | 20 | ||||
| -rw-r--r-- | pom.xml | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/alpine/java17/src/main/docker/Dockerfile b/alpine/java17/src/main/docker/Dockerfile index 5018e1af..e1bebd20 100644 --- a/alpine/java17/src/main/docker/Dockerfile +++ b/alpine/java17/src/main/docker/Dockerfile @@ -3,16 +3,16 @@ FROM ${base.image}:${base.image.version} MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) USER root -ARG http_proxy -ARG https_proxy -ARG no_proxy - -ENV HTTP_PROXY $http_proxy -ENV http_proxy $http_proxy -ENV HTTPS_PROXY $https_proxy -ENV https_proxy $https_proxy -ENV NO_PROXY $no_proxy -ENV no_proxy $no_proxy +ARG HTTP_PROXY +ARG HTTPS_PROXY +ARG NO_PROXY + +ENV HTTP_PROXY ${HTTP_PROXY} +ENV http_proxy ${HTTP_PROXY} +ENV HTTPS_PROXY ${HTTPS_PROXY} +ENV https_proxy ${HTTPS_PROXY} +ENV NO_PROXY ${NO_PROXY} +ENV no_proxy ${NO_PROXY} ENV JAVA_HOME /opt/java/openjdk @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>oparent</artifactId> - <version>2.6.1</version> + <version>2.7.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.distribution</groupId> |