mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-05-30 15:45:24 +00:00
[es] Adapt to new Dockerfile ADD behavior
This commit is contained in:
@@ -4,12 +4,13 @@ LABEL maintainer "itzg"
|
|||||||
|
|
||||||
RUN apk -U add bash
|
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 && \
|
RUN cd /usr/share && \
|
||||||
tar xf /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 /tmp/es.tgz
|
rm -f /tmp/elasticsearch-$ES_VERSION.tar.gz
|
||||||
|
|
||||||
EXPOSE 9200 9300
|
EXPOSE 9200 9300
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user