diff options
| author |   Manisha Aggarwal <ma9181@att.com> | 2017-06-21 15:51:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-06-21 15:51:11 +0000 |
| commit | 2108aabe58a7117c76470b053c15a53a6190ac5f (patch) | |
| tree | 90c9e5798922b25c6ef298a21a1e67f2801ecbed | |
| parent | 23c11d892dcc817ec3572e0758666ed093f6f504 (diff) | |
| parent | 45a61a665251d2836b354041dab9877bc0541e80 (diff) | |
Merge "Add HTTP_PROXY and HTTPS_PROXY args"
| -rw-r--r-- | aai-traversal/src/main/resources/docker/Dockerfile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/aai-traversal/src/main/resources/docker/Dockerfile b/aai-traversal/src/main/resources/docker/Dockerfile index ef0854e..596c71d 100644 --- a/aai-traversal/src/main/resources/docker/Dockerfile +++ b/aai-traversal/src/main/resources/docker/Dockerfile @@ -2,9 +2,12 @@ FROM ubuntu:14.04 ENV DEBIAN_FRONTEND noninteractive +ARG HTTP_PROXY +ARG HTTPS_PROXY + ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTP_PROXY} -ENV https_proxy ${HTTP_PROXY} +ENV HTTPS_PROXY ${HTTPS_PROXY} +ENV https_proxy ${HTTPS_PROXY} ENV http_proxy ${HTTP_PROXY} # Setup JAVA_HOME, this is useful for docker commandline @@ -18,7 +21,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 # for the best possible performance out of your image RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::https::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ + if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi && \ apt-get update && \ apt-get install -y software-properties-common uuid-runtime && \ apt-get install --reinstall ca-certificates && \ |