summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManisha Aggarwal <ma9181@att.com>2017-06-21 15:50:46 +0000
committerGerrit Code Review <gerrit@onap.org>2017-06-21 15:50:46 +0000
commit3c9490abf80793988b32b3a75fc6f386a56c832e (patch)
tree7f2876879da72bba2715f744e5652d3f9ad018ff
parent894fd86a0eeca96d6556bdac2816cc08398ebe10 (diff)
parent3aa18893e721a53c64fa87a968ae3a4b30517966 (diff)
Merge "Add HTTP_PROXY and HTTPS_PROXY args"
-rw-r--r--aai-resources/src/main/resources/docker/Dockerfile9
1 files changed, 6 insertions, 3 deletions
diff --git a/aai-resources/src/main/resources/docker/Dockerfile b/aai-resources/src/main/resources/docker/Dockerfile
index 079805d..8da5740 100644
--- a/aai-resources/src/main/resources/docker/Dockerfile
+++ b/aai-resources/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 && \
apt-get install --reinstall ca-certificates && \