[es] Correcting old-ADD tar file path

Merge pull request #169 from manojsb/patch-1
Upgrade to ES 5.5.0
2026-02-17 23:16:24 +00:00 · 2017-07-13 09:09:10 -05:00 · 2017-07-13 08:53:42 -05:00 · 2017-07-13 08:52:02 -05:00 · 2017-07-12 11:41:13 +05:30 · 2017-07-04 18:08:10 -05:00
2 changed files with 9 additions and 4 deletions
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -4,12 +4,16 @@ LABEL maintainer "itzg"

 RUN apk -U add bash

-ENV ES_VERSION=5.4.3
+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/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

--- a/elasticsearch/docker-compose-3x1GB.yml
+++ b/elasticsearch/docker-compose-3x1GB.yml
@@ -9,6 +9,7 @@ services:
      UNICAST_HOSTS: master
      MIN_MASTERS: 1
      ES_JAVA_OPTS: -Xms756m -Xmx756m
+      TYPE: NON_DATA
    ports:
      - "9200:9200"
      - "9300:9300"
Author	SHA1	Message	Date
Geoff Bourne	caf2fc2ab6	[es] Correcting old-ADD tar file path	2017-07-13 09:09:10 -05:00
Geoff Bourne	5dd8141e5e	Merge pull request #169 from manojsb/patch-1 Upgrade to ES 5.5.0	2017-07-13 08:53:42 -05:00
Geoff Bourne	2ff28675d4	[es] Adapt to new Dockerfile ADD behavior	2017-07-13 08:52:02 -05:00
Manoj Kumar	519bd986b5	Update Dockerfile Updated to v5.5.0	2017-07-12 11:41:13 +05:30
Geoff Bourne	e41efba176	[es] Using NON_DATA in 3x1GB stack For #165	2017-07-04 18:08:10 -05:00