Merge pull request #128 from gerardorochin/update-5.0.0

Update to 5.0.0
docker-library · Oct 26, 2016 · 6fa9d5c · 6fa9d5c
2 parents 7d45e3f + 986deb9
commit 6fa9d5c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: bash
 services: docker
 
 env:
-  - VERSION=5.0-rc
+  - VERSION=5.0
   - VERSION=2.4
   - VERSION=2.3
   - VERSION=2.2

diff --git a/5.0-rc/Dockerfile → 5.0/Dockerfile b/5.0-rc/Dockerfile → 5.0/Dockerfile
@@ -12,16 +12,16 @@ RUN set -x \
 	&& chmod +x /usr/local/bin/gosu \
 	&& gosu nobody true
 
-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
 
 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html
 # https://www.elastic.co/guide/en/elasticsearch/reference/5.0/deb.html
 RUN set -x \
 	&& apt-get update && apt-get install -y --no-install-recommends apt-transport-https && rm -rf /var/lib/apt/lists/* \
-	&& echo 'deb https://artifacts.elastic.co/packages/5.x-prerelease/apt stable main' > /etc/apt/sources.list.d/elasticsearch.list
+	&& echo 'deb https://artifacts.elastic.co/packages/5.x/apt stable main' > /etc/apt/sources.list.d/elasticsearch.list
 
-ENV ELASTICSEARCH_VERSION 5.0.0-rc1
+ENV ELASTICSEARCH_VERSION 5.0.0
 
 RUN set -x \
 	&& apt-get update \

diff --git a/5.0-rc/config/elasticsearch.yml → 5.0/config/elasticsearch.yml b/5.0-rc/config/elasticsearch.yml → 5.0/config/elasticsearch.yml
diff --git a/5.0-rc/config/log4j2.properties → 5.0/config/log4j2.properties b/5.0-rc/config/log4j2.properties → 5.0/config/log4j2.properties
diff --git a/5.0-rc/docker-entrypoint.sh → 5.0/docker-entrypoint.sh b/5.0-rc/docker-entrypoint.sh → 5.0/docker-entrypoint.sh
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -12,7 +12,7 @@ RUN set -x \
 	&& chmod +x /usr/local/bin/gosu \
 	&& gosu nobody true
 
-# https://packages.elasticsearch.org/GPG-KEY-elasticsearch
+# https://artifacts.elastic.co/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
 
 # https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-repositories.html