From c789e6fd5aaf3316ce640bbdeabcfcec6db84624 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Thu, 3 May 2018 18:05:37 +0300 Subject: fix merge failure set all versions in the bases Change-Id: I9e54a5b391c97c261045d8e6fca02aa84f926478 Issue-ID: SDC-1222 Signed-off-by: Michael Lando --- base_sdc-sanity/Dockerfile | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'base_sdc-sanity') diff --git a/base_sdc-sanity/Dockerfile b/base_sdc-sanity/Dockerfile index dee2bde..ce53b20 100644 --- a/base_sdc-sanity/Dockerfile +++ b/base_sdc-sanity/Dockerfile @@ -1,20 +1,6 @@ FROM openjdk:8-jdk-alpine -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 apk add --no-cache \ - curl \ - vim \ - && : - # Install Chef RUN set -ex && \ - apk add --no-cache bash build-base ruby ruby-dev libffi-dev libxml2-dev && \ - gem install chef berkshelf io-console --no-document + 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 -- cgit 1.2.3-korg