X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=base_sdc-sanity%2FDockerfile;h=35dff606d038d310a1137f46993c967d82bbeadb;hb=18cba5cee4111729ab145b0b4c5f741e44b026d8;hp=29f8b202ca9e43bc8a45d681f1f711c3a3b78a4c;hpb=547839b3d0027aa7e0329a13a206b139c0712b95;p=sdc%2Fsdc-docker-base.git diff --git a/base_sdc-sanity/Dockerfile b/base_sdc-sanity/Dockerfile index 29f8b20..35dff60 100644 --- a/base_sdc-sanity/Dockerfile +++ b/base_sdc-sanity/Dockerfile @@ -1,24 +1,9 @@ -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 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 \ - curl \ - default-jre \ - openjdk-8-jdk \ - vim - -# Set Java links -RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java - -# install chef-solo -RUN curl -L https://omnitruck.chef.io/install.sh | bash - +FROM openjdk:8-jdk-alpine + +# Install Chef +RUN set -ex && \ + apk add --no-cache curl vim bash=4.4.19-r1 build-base=0.5-r0 ruby=2.4.4-r0 ruby-dev=2.4.4-r0 libffi-dev=3.2.1-r4 libxml2-dev=2.9.7-r0 && \ + gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 --no-document && \ + echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ + apk update && \ + apk add binutils=2.30-r1 curl=7.60.0-r1 libcurl=7.60.0-r1 libtasn1=4.13-r0