diff options
Diffstat (limited to 'sdc-os-chef/sdc-sanity/Dockerfile')
| -rw-r--r-- | sdc-os-chef/sdc-sanity/Dockerfile | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/sdc-os-chef/sdc-sanity/Dockerfile b/sdc-os-chef/sdc-sanity/Dockerfile index dd486102c5..9dd829158f 100644 --- a/sdc-os-chef/sdc-sanity/Dockerfile +++ b/sdc-os-chef/sdc-sanity/Dockerfile @@ -1,9 +1,20 @@ -FROM ubuntu -RUN apt-get -y update && apt-get -y install --no-install-recommends apt-utils -RUN apt-get -y install curl -RUN apt-get -y install vim -RUN apt-get -y install default-jre && apt-get -y install openjdk-8-jdk -RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java +FROM ubuntu:16.04 + +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 && \ +RUN apt-get -y update && \ + apt-get -y install --no-install-recommends apt-utils && \ + apt-get install curl \ + default-jre + openjdk-8-jdk + vim && \ + update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java + if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi COPY chef-solo /root/chef-solo/ COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/ |