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-kibana/Dockerfile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'base_sdc-kibana') diff --git a/base_sdc-kibana/Dockerfile b/base_sdc-kibana/Dockerfile index 10ece1a..76d2d11 100644 --- a/base_sdc-kibana/Dockerfile +++ b/base_sdc-kibana/Dockerfile @@ -1,17 +1,8 @@ FROM kibana:4.3.3 -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 && \ - 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 \ - curl \ - vim + curl=7.38.0-4+deb8u10 \ + vim=2:7.4.488-7+deb8u3 # install chef-solo RUN curl -L https://omnitruck.chef.io/install.sh | bash -- cgit 1.2.3-korg