fix merge failure

[sdc/sdc-docker-base.git] / base_sdc-sanity / Dockerfile

diff --git a/base_sdc-sanity/Dockerfile b/base_sdc-sanity/Dockerfile
index dee2bde..ce53b20 100644 (file)
--- 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