diff options
| author |   Manoop Talasila <talasila@research.att.com> | 2017-07-06 20:38:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-07-06 20:38:03 +0000 |
| commit | fec1ab242c9086a32b04e3ded4518dd20eeca7d3 (patch) | |
| tree | 7b2436d3d7d4ea07f87ceedc946ae629a0ee5283 /deliveries/os_Dockerfile | |
| parent | 6771b0e2bf6b0df221c920466a495e84e83a44f5 (diff) | |
| parent | 47d9cadde3ea38210db0324564960a9853d863a2 (diff) | |
Merge "Add proxy support in DockerFile"
Diffstat (limited to 'deliveries/os_Dockerfile')
| -rw-r--r-- | deliveries/os_Dockerfile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/deliveries/os_Dockerfile b/deliveries/os_Dockerfile index efba0bdd..56faa6ad 100644 --- a/deliveries/os_Dockerfile +++ b/deliveries/os_Dockerfile @@ -3,6 +3,15 @@ FROM ubuntu:14.04 +ARG HTTP_PROXY=${HTTP_PROXY} +ARG HTTPS_PROXY=${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 + # Install the python script required for "add-apt-repository" RUN apt-get update && apt-get install -y software-properties-common |