Update testing environment to beta1 IRC #2553
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Changed the logstash dockerfile to use the tar.gz which is much simpler. - Unfortunately it still doesn't work, I posted: logstash-plugins/logstash-input-beats#129 - For elasticsearch I did a hack for now, but we should consider moving to the tar.gz as well
ruflin
reviewed
Sep 15, 2016
| @@ -5,7 +5,7 @@ ENV ELASTICSEARCH_VERSION master | |||
|
|
|||
|
|
|||
| COPY setup.sh / | |||
| RUN bash setup.sh https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/5.0.0-alpha5/elasticsearch-5.0.0-alpha5.deb | |||
| RUN bash setup.sh http://staging.elastic.co/5.0.0-beta1-2b315be2/download/elasticsearch/elasticsearch-5.0.0-beta1.deb | |||
There was a problem hiding this comment.
Can we use https for the url? Seems to also work
ruflin
requested changes
Sep 15, 2016
| @@ -16,7 +16,7 @@ RUN arch="$(dpkg --print-architecture)" \ | |||
| && chmod +x /usr/local/bin/gosu | |||
|
|
|||
| RUN set -x \ | |||
| && curl -fSL "https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha6-SNAPSHOT-linux-x86_64.tar.gz?20160908" -o kibana.tar.gz \ | |||
| && curl -fSL "http://staging.elastic.co/5.0.0-beta1-2b315be2/download/kibana/kibana-5.0.0-beta1-linux-x86_64.tar.gz" -o kibana.tar.gz \ | |||
| ENV VERSION 5.0.0-beta1 | ||
| ENV PATH $PATH:/opt/logstash-$VERSION/bin | ||
|
|
||
| RUN echo $PATH |
| @@ -1,18 +1,9 @@ | |||
| #!/usr/bin/env bash | |||
|
|
|||
| # setup logstash dependencies | |||
| set -x && \ | |||
There was a problem hiding this comment.
Nice, that will speed up the build quite a bit.
| apt-get install -y --no-install-recommends logrotate && \ | ||
| apt-get clean && \ | ||
| rm -rf /var/lib/apt/lists/* | ||
|
|
||
| # download & install logstash |
There was a problem hiding this comment.
In case that are all the lines left, we probably can remove the setup.sh script and move everything back to the docker file.
There was a problem hiding this comment.
I did that, and restored the setup.sh script to its initial form.
| @@ -1,18 +1,9 @@ | |||
| #!/usr/bin/env bash | |||
|
|
|||
| # setup logstash dependencies | |||
| set -x && \ | |||
| apt-get update && \ | |||
There was a problem hiding this comment.
Remove this could affect the old (non snapshot docker files ...)
|
Updated to IRC2, so tests should hopefully pass this time around. |
|
Comments should be addressed, now. |
|
LGTM. Waiting for travis. |
|
Merging as flaky filebeat tests is not related to this change. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
simpler.
Exception while converting Key logstash-plugins/logstash-input-beats#129
to the tar.gz as well