Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tests to most recent alpha5 dependencies #2106

Merged
merged 1 commit into from
Jul 27, 2016
Merged

Update tests to most recent alpha5 dependencies #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions testing/environments/5.0.0-alpha4.yml → testing/environments/5.0.0-alpha5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

elasticsearch:
build: ./docker/elasticsearch
dockerfile: Dockerfile-5.0.0-alpha4
dockerfile: Dockerfile-5.0.0-alpha5
command: elasticsearch -Enetwork.host=0.0.0.0 -Ediscovery.zen.minimum_master_nodes=1 -Ebootstrap.ignore_system_bootstrap_checks=true

logstash:
build: ./docker/logstash
dockerfile: Dockerfile-5.0.0-alpha4
dockerfile: Dockerfile-5.0.0-alpha5

kibana:
build: ./docker/kibana
dockerfile: Dockerfile-5.0.0-alpha4
dockerfile: Dockerfile-5.0.0-alpha5

2 changes: 1 addition & 1 deletion ...ker/elasticsearch/Dockerfile-5.0.0-alpha4 → ...ker/elasticsearch/Dockerfile-5.0.0-alpha5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV ELASTICSEARCH_VERSION master


COPY setup.sh /
RUN bash setup.sh http://download.elastic.co/elasticsearch/staging/5.0.0-alpha4-b0da471/org/elasticsearch/distribution/deb/elasticsearch/5.0.0-alpha4/elasticsearch-5.0.0-alpha4.deb
RUN bash setup.sh http://download.elastic.co/elasticsearch/staging/5.0.0-alpha5-95ae58b/org/elasticsearch/distribution/deb/elasticsearch/5.0.0-alpha5/elasticsearch-5.0.0-alpha5.deb

ENV PATH /usr/share/elasticsearch/bin:$PATH

Expand Down
2 changes: 1 addition & 1 deletion testing/environments/docker/elasticsearch/Dockerfile-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV ELASTICSEARCH_VERSION master


COPY setup.sh /
RUN bash setup.sh http://download.elastic.co/elasticsearch/staging/5.0.0-alpha4-3f5b994/org/elasticsearch/distribution/deb/elasticsearch/5.0.0-alpha4/elasticsearch-5.0.0-alpha4.deb
RUN bash setup.sh http://download.elastic.co/elasticsearch/staging/5.0.0-alpha5-95ae58b/org/elasticsearch/distribution/deb/elasticsearch/5.0.0-alpha5/elasticsearch-5.0.0-alpha5.deb

ENV PATH /usr/share/elasticsearch/bin:$PATH

Expand Down
2 changes: 1 addition & 1 deletion ...nts/docker/kibana/Dockerfile-5.0.0-alpha4 → ...nts/docker/kibana/Dockerfile-5.0.0-alpha5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN arch="$(dpkg --print-architecture)" \

RUN set -x \

&& curl -fSL "https://download.elastic.co/kibana/staging/5.0.0-alpha4-c6f5963/kibana/kibana-5.0.0-alpha4-linux-x64.tar.gz" -o kibana.tar.gz \
&& curl -fSL "https://download.elastic.co/kibana/staging/5.0.0-alpha5-717589e/kibana/kibana-5.0.0-alpha5-linux-x86_64.tar.gz" -o kibana.tar.gz \
&& mkdir -p /opt/kibana \
&& tar -xz --strip-components=1 -C /opt/kibana -f kibana.tar.gz \
&& chown -R kibana:kibana /opt/kibana \
Expand Down
2 changes: 1 addition & 1 deletion ...s/docker/logstash/Dockerfile-5.0.0-alpha4 → ...s/docker/logstash/Dockerfile-5.0.0-alpha5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV PATH $PATH:/opt/logstash/bin:/opt/logstash/vendor/jruby/bin
COPY setup.sh /

# As all snapshot builds have the same url, the image is cached. The date at then can be used to invalidate the image
RUN bash setup.sh https://download.elastic.co/logstash/logstash/logstash-5.0.0-alpha4.deb
RUN bash setup.sh https://s3-eu-west-1.amazonaws.com/build-eu.elasticsearch.org/logstash/master/nightly/JDK8/logstash-latest-SNAPSHOT.deb?20160727


COPY logstash.conf.2.tmpl /logstash.conf.2.tmpl
Expand Down
2 changes: 1 addition & 1 deletion testing/environments/docker/logstash/Dockerfile-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV PATH $PATH:/usr/share/logstash/bin
COPY setup.sh /

# As all snapshot builds have the same url, the image is cached. The date at then can be used to invalidate the image
RUN bash setup.sh https://s3-eu-west-1.amazonaws.com/build-eu.elasticsearch.org/logstash/master/nightly/JDK8/logstash-latest-SNAPSHOT.deb?20160729
RUN bash setup.sh https://s3-eu-west-1.amazonaws.com/build-eu.elasticsearch.org/logstash/master/nightly/JDK8/logstash-latest-SNAPSHOT.deb?20160727

COPY logstash.conf.2.tmpl /logstash.conf.2.tmpl
COPY docker-entrypoint.sh /entrypoint.sh
Expand Down