From 2ff28675d4e78fa5ca4333334f4976e3b7326d0e Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Thu, 13 Jul 2017 08:52:02 -0500 Subject: [PATCH] [es] Adapt to new Dockerfile ADD behavior --- elasticsearch/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index ae8bc021..69949670 100755 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -4,12 +4,13 @@ LABEL maintainer "itzg" RUN apk -U add bash -ENV ES_VERSION=5.5.0 +ARG ES_VERSION=5.5.0 -ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp/es.tgz +ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp +# need to adapt to both Docker's new remote-unpack-ADD behavior and the old behavior RUN cd /usr/share && \ - tar xf /tmp/es.tgz && \ - rm /tmp/es.tgz + if [ -f /tmp/elasticsearch-$ES_VERSION.tar.gz ]; then tar xf /tmp/es.tgz; else mv /tmp/elasticsearch-${ES_VERSION} /usr/share; fi && \ + rm -f /tmp/elasticsearch-$ES_VERSION.tar.gz EXPOSE 9200 9300