diff options
| author |   Chuck Short <charles.short@ericsson.com> | 2017-07-14 09:06:21 -0500 |
|---|---|---|
| committer |   Michael Lando <ml636r@att.com> | 2017-07-19 17:00:32 +0300 |
| commit | 77121587873d2b17e48632ffc5fe13ff44089283 (patch) | |
| tree | a4891ae7338cb2cf6f5aadf7b417a3dc11f06524 | |
| parent | 78e69cfc10b39db343b61f658459fd817d923599 (diff) | |
Clean up Dockerfile
- Try to follow Dockerfile best practices:
https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
- Cleanup formatting to make it a bit more readable.
Change-Id: I9b5e13bdb270477ea92c0b101beaa519e5fe6223
Signed-off-by: Chuck Short <charles.short@ericsson.com>
Signed-off-by: Michael Lando <ml636r@att.com>
| -rw-r--r-- | sdc-os-chef/sdc-sanity/Dockerfile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sdc-os-chef/sdc-sanity/Dockerfile b/sdc-os-chef/sdc-sanity/Dockerfile index 2b29131d81..c5421a117c 100644 --- a/sdc-os-chef/sdc-sanity/Dockerfile +++ b/sdc-os-chef/sdc-sanity/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu +FROM ubuntu:16.04 ARG HTTP_PROXY ARG HTTPS_PROXY @@ -7,12 +7,14 @@ 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 -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 COPY chef-solo /root/chef-solo/ COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/ @@ -22,4 +24,5 @@ RUN curl -L https://omnitruck.chef.io/install.sh | bash COPY startup.sh /root/ RUN chmod 770 /root/startup.sh + ENTRYPOINT [ "/root/startup.sh" ] |