From 3aa18893e721a53c64fa87a968ae3a4b30517966 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Wed, 14 Jun 2017 09:52:58 -0500 Subject: 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 --- aai-resources/src/main/resources/docker/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'aai-resources/src/main') 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 && \ -- cgit 1.2.3-korg