summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-07-19 17:02:34 +0000
committerGerrit Code Review <gerrit@onap.org>2017-07-19 17:02:34 +0000
commit30db4407bab8cfea48e278d29e55b11c6c0a528c (patch)
treea4891ae7338cb2cf6f5aadf7b417a3dc11f06524 /sdc-os-chef
parent6789ffa5b9dad20c0b60f427f5b6fe432d689d51 (diff)
parent77121587873d2b17e48632ffc5fe13ff44089283 (diff)
Merge "Clean up Dockerfile"
Diffstat (limited to 'sdc-os-chef')
-rw-r--r--sdc-os-chef/sdc-sanity/Dockerfile15
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" ]