diff options
| author |   Michael Lando <ml636r@att.com> | 2017-07-19 13:15:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-07-19 13:15:36 +0000 |
| commit | 78e69cfc10b39db343b61f658459fd817d923599 (patch) | |
| tree | fda49ab25827b4a044897c64a5cb6652238597cd /sdc-os-chef/sdc-backend | |
| parent | 02c97b34aea7c3edc91b4b3227d08e571ce5e1ab (diff) | |
| parent | 648b32ece75395b0dd71a7eff9c1270b45f71c52 (diff) | |
Merge "Add proxy support"
Diffstat (limited to 'sdc-os-chef/sdc-backend')
| -rw-r--r-- | sdc-os-chef/sdc-backend/Dockerfile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile index e872919a11..3a39d257e3 100644 --- a/sdc-os-chef/sdc-backend/Dockerfile +++ b/sdc-os-chef/sdc-backend/Dockerfile @@ -1,4 +1,13 @@ -FROM jetty:9.3-jre8 +FROM jetty:9.3.15-jre8 + +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 RUN apt-get -y update RUN apt-get -y install apt-utils |