[es] Correcting old-ADD tar file path

This commit is contained in:
Geoff Bourne 2017-07-13 09:09:10 -05:00
parent 5dd8141e5e
commit caf2fc2ab6

View File

@ -9,7 +9,10 @@ ARG ES_VERSION=5.5.0
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 && \
if [ -f /tmp/elasticsearch-$ES_VERSION.tar.gz ]; then tar xf /tmp/es.tgz; else mv /tmp/elasticsearch-${ES_VERSION} /usr/share; fi && \
if [ -f /tmp/elasticsearch-$ES_VERSION.tar.gz ]; then \
tar xf /tmp/elasticsearch-$ES_VERSION.tar.gz; \
else mv /tmp/elasticsearch-${ES_VERSION} /usr/share; \
fi && \
rm -f /tmp/elasticsearch-$ES_VERSION.tar.gz
EXPOSE 9200 9300