Skip to content

Commit

Permalink
Update testing env for the stable stack version
Browse files Browse the repository at this point in the history
* Always use our Dockerfiles, not the "official" images from Docker.
* Updated to use the released versions of 2.3/4.5
  • Loading branch information
Tudor Golubenco committed Apr 7, 2016
1 parent d8531de commit 4be0e51
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 42 deletions.
4 changes: 2 additions & 2 deletions testing/environments/docker/elasticsearch/Dockerfile-2.3.0
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ RUN arch="$(dpkg --print-architecture)" \
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

ENV ELASTICSEARCH_MAJOR 2.3
ENV ELASTICSEARCH_VERSION 2.3.0
ENV ELASTICSEARCH_REPO_BASE http://download.elasticsearch.org/elasticsearch/staging/2.3.0-8371be8/repos/2.x/debian/
ENV ELASTICSEARCH_VERSION 2.3.1
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

Expand Down
37 changes: 0 additions & 37 deletions testing/environments/docker/kibana/Dockerfile-4.4.0

This file was deleted.

9 changes: 6 additions & 3 deletions testing/environments/latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
# It inherits from base.yml

elasticsearch:
image: elasticsearch:latest
build: docker/elasticsearch
dockerfile: Dockerfile-2.3.0
command: elasticsearch -Des.network.host=0.0.0.0

logstash:
image: logstash:latest
build: docker/logstash
dockerfile: Dockerfile-2.3.0

kibana:
build: docker/kibana/
dockerfile: Dockerfile-4.4.0
dockerfile: Dockerfile-4.5.0

0 comments on commit 4be0e51

Please sign in to comment.