summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2017-06-14 09:52:58 -0500
committerVictor Morales <victor.morales@intel.com>2017-06-14 09:52:58 -0500
commit3aa18893e721a53c64fa87a968ae3a4b30517966 (patch)
tree8e2cb613e6529ae7c214e853a78506a541b2447b
parent2dd06f1f3180ba20485f268fd4a83b4961f15b8e (diff)
Add HTTP_PROXY and HTTPS_PROXY args
It was included a mechanism to pass proxy arguments to the image. Besides fixing the use of HTTPS_PROXY. Change-Id: I98d8be3a122e8b549318af2362302e0305850694 Signed-off-by: Victor Morales <victor.morales@intel.com>
-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 && \