diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-07-01 23:07:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-07-01 23:07:51 +0000 |
| commit | a0aaa333acb0f1f39530ec2c486dcffbf390210e (patch) | |
| tree | 20527f3caee4b56474bf360b6e4672107fbb4d6d | |
| parent | 4745d7a3158598bbec76d39d4bee9d2f6e8c58cc (diff) | |
| parent | 468f6d28a1a27fcdd5440e714ef93b038ba49247 (diff) | |
Merge "Add proxy support"
Former-commit-id: cee38293eb9f404449769c75c9ad107f639d373b
| -rw-r--r-- | installation/ubuntu/src/main/docker/Dockerfile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/installation/ubuntu/src/main/docker/Dockerfile b/installation/ubuntu/src/main/docker/Dockerfile index 5d5b1b82..7d8e6eb3 100644 --- a/installation/ubuntu/src/main/docker/Dockerfile +++ b/installation/ubuntu/src/main/docker/Dockerfile @@ -1,7 +1,15 @@ # Base ubuntu with added packages needed for open ecomp FROM ubuntu:16.04 MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) -# Set proxy if needed -# RUN echo 'Acquire::http::Proxy "http://your.proxy.com:8080";' > /etc/apt/apt.conf + +ARG HTTP_PROXY +ARG HTTPS_PROXY + +ENV HTTP_PROXY ${HTTP_PROXY} +ENV HTTPS_PROXY ${HTTPS_PROXY} + +RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ + if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi + # Add tools needed for OpenDaylight RUN apt-get update && apt-get install -y git openjdk-8-jdk maven mysql-client nodejs nodejs-legacy python-pip graphviz npm unzip |