Merge pull request elastic#951 from ruflin/test-environment

Update test builds to latest elasticsearch and logstash version.
eric4545 · Feb 9, 2016 · 31c7e04 · 31c7e04
2 parents bbc9d3c + f79ab5c
commit 31c7e04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libbeat/docker-compose.yml b/libbeat/docker-compose.yml
@@ -23,7 +23,7 @@ beat:
   entrypoint: /go/src/github.com/elastic/beats/libbeat/scripts/docker-entrypoint.sh
 elasticsearch:
   build: ../testing/environments/docker/elasticsearch
-  dockerfile: Dockerfile-2.2.0
+  dockerfile: Dockerfile-2.2.0-shield
   command: elasticsearch -Des.network.host=0.0.0.0
 redis:
   image: redis

diff --git a/testing/environments/docker/elasticsearch/Dockerfile-2.2.0-shield b/testing/environments/docker/elasticsearch/Dockerfile-2.2.0-shield
@@ -14,7 +14,7 @@ RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC85485
 
 ENV ELASTICSEARCH_MAJOR 2.2
 ENV ELASTICSEARCH_VERSION 2.2.0
-ENV ELASTICSEARCH_REPO_BASE http://download.elasticsearch.org/elasticsearch/staging/2.2.0-848ea4e/repos/2.x/debian/
+ENV ELASTICSEARCH_REPO_BASE http://packages.elastic.co/elasticsearch/2.x/debian
 
 RUN echo "deb $ELASTICSEARCH_REPO_BASE stable main" > /etc/apt/sources.list.d/elasticsearch.list
 

diff --git a/testing/environments/docker/logstash/Dockerfile-2.2.0 b/testing/environments/docker/logstash/Dockerfile-2.2.0
@@ -2,7 +2,7 @@ FROM java:8-jre
 
 ENV LS_VERSION 2
 
-ENV DEB_URL https://download.elastic.co/logstash/logstash/logstash-latest-SNAPSHOT.deb
+ENV DEB_URL https://download.elastic.co/logstash/logstash/packages/debian/logstash_2.2.0-1_all.deb
 
 ENV PATH $PATH:/opt/logstash/bin:/opt/logstash/vendor/jruby/bin