Skip to content

Add 2.4.0 #118

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.

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

Merged
merged 1 commit into from
Aug 31, 2016
Merged

Add 2.4.0 #118

merged 1 commit into from
Aug 31, 2016

Conversation

gerardorochin
Copy link
Contributor

@tianon
Copy link
Member

tianon commented Aug 31, 2016

Nice! 👍 LGTM

commit 7a502275158cac1affa4372eab937a21913cd3e0
Author: Gerardo Rochín <[email protected]>
Date:   Wed Aug 31 10:37:20 2016 -0600

    Add 2.4.0

diff --git a/.travis.yml b/.travis.yml
index 82c3ffa..e3aedcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ services: docker

 env:
   - VERSION=5.0
+  - VERSION=2.4
   - VERSION=2.3
   - VERSION=2.2
   - VERSION=2.1
diff --git a/2.1/Dockerfile b/2.4/Dockerfile
similarity index 98%
copy from 2.1/Dockerfile
copy to 2.4/Dockerfile
index 1663f07..8fce334 100644
--- a/2.1/Dockerfile
+++ b/2.4/Dockerfile
@@ -16,7 +16,7 @@ RUN set -x \
 # https://packages.elasticsearch.org/GPG-KEY-elasticsearch
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4

-ENV ELASTICSEARCH_VERSION 2.1.2
+ENV ELASTICSEARCH_VERSION 2.4.0
 ENV ELASTICSEARCH_REPO_BASE http://packages.elasticsearch.org/elasticsearch/2.x/debian

 RUN echo "deb $ELASTICSEARCH_REPO_BASE stable main" > /etc/apt/sources.list.d/elasticsearch.list
diff --git a/2.3/config/elasticsearch.yml b/2.4/config/elasticsearch.yml
similarity index 100%
copy from 2.3/config/elasticsearch.yml
copy to 2.4/config/elasticsearch.yml
diff --git a/5.0/config/logging.yml b/2.4/config/logging.yml
similarity index 100%
copy from 5.0/config/logging.yml
copy to 2.4/config/logging.yml
diff --git a/docker-entrypoint.sh b/2.4/docker-entrypoint.sh
similarity index 100%
copy from docker-entrypoint.sh
copy to 2.4/docker-entrypoint.sh
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index f80c898..494d6db 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -3,7 +3,7 @@ set -eu

 declare -A aliases=(
    [1.7]='1'
-   [2.3]='2 latest'
+   [2.4]='2 latest'
    [5.0]='5'
 )

(will merge as soon as Travis is finished)

@tianon
Copy link
Member

tianon commented Aug 31, 2016

@tianon tianon merged commit 61100bb into docker-library:master Aug 31, 2016
@gerardorochin gerardorochin deleted the update_to_2.4.0 branch August 31, 2016 16:42
1gtm pushed a commit to appscode-images/elasticsearch that referenced this pull request Feb 14, 2024
This commit was created by the elastic-dockerfiles-publisher.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants