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 to 5.0.0 #128

Merged
merged 2 commits into from
Oct 26, 2016
Merged

Update to 5.0.0 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acd1423
Update to 5.0.0
gerardorochin Oct 26, 2016
986deb9
Fix url to next releases
gerardorochin Oct 26, 2016
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions 5.0-rc/Dockerfile → 5.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this change probably needs to be in the template itself too 😇

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no problem, i am working to fix

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 \
Expand Down
0 5.0-rc/config/elasticsearch.yml → 5.0/config/elasticsearch.yml
View file
Open in desktop
File renamed without changes.
0 5.0-rc/config/log4j2.properties → 5.0/config/log4j2.properties
View file
Open in desktop
File renamed without changes.
0 5.0-rc/docker-entrypoint.sh → 5.0/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down