summaryrefslogtreecommitdiffstats
path: root/base_sdc-elasticsearch/Dockerfile
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-05-03 18:05:37 +0300
committerMichael Lando <ml636r@att.com>2018-05-03 18:05:37 +0300
commitc789e6fd5aaf3316ce640bbdeabcfcec6db84624 (patch)
tree72bb0fd1f718c42c45846467b8d5bdab6701f8f8 /base_sdc-elasticsearch/Dockerfile
parent59d7583ae891fd9989b33c1f830da2a9c5befecc (diff)
fix merge failure
set all versions in the bases Change-Id: I9e54a5b391c97c261045d8e6fca02aa84f926478 Issue-ID: SDC-1222 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'base_sdc-elasticsearch/Dockerfile')
-rw-r--r--base_sdc-elasticsearch/Dockerfile18
1 files changed, 2 insertions, 16 deletions
diff --git a/base_sdc-elasticsearch/Dockerfile b/base_sdc-elasticsearch/Dockerfile
index 744e62d..8cbfeb2 100644
--- a/base_sdc-elasticsearch/Dockerfile
+++ b/base_sdc-elasticsearch/Dockerfile
@@ -1,22 +1,8 @@
FROM elasticsearch:2.4.6-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 && \
- if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
-
-RUN apk add --no-cache \
- curl \
- vim \
- && :
-
RUN mkdir -p /var/chef/nodes
# Install Chef
RUN set -ex && \
- apk add --no-cache bash build-base ruby ruby-dev libffi-dev libxml2-dev && \
- gem install chef:13.8.5 berkshelf io-console --no-document
+ apk add --no-cache curl vim bash=4.4.12-r2 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