Merge branch 'release/rel-0.9.0'

Author: pblittle

Dockerfile

@@ -1,13 +1,6 @@
-FROM debian:jessie
+FROM java:7-jre
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com>
 
-# Download latest package lists & install dependencies
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive \
-    apt-get install -yq \
-    openjdk-7-jre-headless \
-    wget
-
 # Download version 1.4.2 of logstash
 RUN cd /tmp && \
     wget https://download.elasticsearch.org/logstash/logstash/logstash-1.4.2.tar.gz && \

Makefile

@@ -1,5 +1,5 @@
 NAME = pblittle/docker-logstash
-VERSION = 0.8.1
+VERSION = 0.9.0
 
 # Set the LOGSTASH_CONFIG_URL env var to your logstash.conf file.
 # We will use our basic config if the value is empty.

README.md

@@ -1,61 +1,37 @@
-# docker-logstash
+# logstash
 
-This is a highly configurable logstash (1.4.2) image running elasticsearch (1.1.1) and Kibana 3 (3.0.1).
+This is a highly configurable logstash (1.4.2) image running Elasticsearch (1.1.1) and Kibana 3 (3.0.1).
 
-## Optional, build and run the image from source
-
-If you prefer to build from source rather than use the [pblittle/docker-logstash][1] trusted build published to the public Docker Registry, execute the following:
-
-    $ git clone https://github.com/pblittle/docker-logstash.git
-    $ cd docker-logstash
-    $ make build
-    $ make <options> run
-
-See below for a complate example using `Vagrant`.
-
-## Running Logstash
+## How to use this image
 
-### First, prepare your Logstash configuration file
-
-The logstash configuration file used in this container is downloaded from the internet using `wget`. The configuration file location is determined by the value of the `LOGSTASH_CONFIG_FILE` environment variable, which is set using the `-e` flag when executing `docker run`.
-
-Unless `LOGSTASH_CONFIG_FILE` is overridden, an [example configuration file][2] for an embedded Elasticsearch will be downloaded, moved to `/opt/logstash.conf`, and used in your container.
-
-I have created two reference config files that can be used for testing:
-
- * [Embedded Elasticsearch server](https://gist.githubusercontent.com/pblittle/8778567/raw/logstash.conf) (default)
- * [Linked Elasticsearch container](https://gist.githubusercontent.com/pblittle/0b937485fa4a322ea9eb/raw/logstash_linked.conf)
-
-You will find example usage using `-e LOGSTASH_CONFIG_URL=<your_logstash_config_url>` below.
-
-### Second, choose an Elasticsearch install type
-
-To run this logstash image, you have to first choose one of three Elasticsearch configurations.
+To run the image, you have to first decide on one of three Elasticsearch configurations:
 
  * Use the embedded Elasticsearch server
  * Use a linked container running Elasticsearch
  * Use an external Elasticsearch server
 
-### Use the embedded Elasticsearch server
+### Embedded Elasticsearch server
 
-To fetch and start a container running logstash and the embedded Elasticsearch server, simply execute:
+To fetch and start a container using an example [logstash.conf][2] and the embedded Elasticsearch server, simply execute:
 
     $ docker run -d \
       -p 9292:9292 \
       -p 9200:9200 \
       pblittle/docker-logstash
 
-If you want to use your own config file rather than the default, don't forget the `LOGSTASH_CONFIG_URL` environment variable as noted above:
+By default, an example [logstash.conf][2] will be downloaded using `wget`, moved to `/opt/logstash.conf`, and used in your container.
+
+To use your own config file, set the `LOGSTASH_CONFIG_URL` environment variable using the `-e` flag as follows:
 
     $ docker run -d \
       -e LOGSTASH_CONFIG_URL=<your_logstash_config_url> \
       -p 9292:9292 \
       -p 9200:9200 \
       pblittle/docker-logstash
 
-### Use a linked container running Elasticsearch
+### Linked container running Elasticsearch
 
-If you want to link to another container running elasticsearch rather than use the embedded server:
+If you want to link to container running Elasticsearch rather than use the embedded Elasticsearch server:
 
     $ docker run -d \
       -e LOGSTASH_CONFIG_URL=<your_logstash_config_url> \
@@ -64,7 +40,7 @@ If you want to link to another container running elasticsearch rather than use t
       -p 9200:9200
       pblittle/docker-logstash
 
-To have you the linked elasticsearch container's `bind_host` and `port` automatically detected, you will need to create an `ES_HOST` and `ES_PORT` placeholder in the `elasticsearch` definition in your logstash config file. For example:
+To have the linked Elasticsearch container's `bind_host` and `port` automatically detected, you will need to create an `ES_HOST` and `ES_PORT` placeholder in the `elasticsearch` definition in your logstash config file. For example:
 
     output {
       elasticsearch {
@@ -73,11 +49,11 @@ To have you the linked elasticsearch container's `bind_host` and `port` automati
       }
     }
 
-I have created an [example linked config file](https://gist.githubusercontent.com/pblittle/0b937485fa4a322ea9eb/raw/logstash_linked.conf) which includes the `ES_HOST` and `ES_PORT` placeholders described above.
+I have created an example [logstash_linked.conf](https://gist.githubusercontent.com/pblittle/0b937485fa4a322ea9eb/raw/logstash_linked.conf) which includes the `ES_HOST` and `ES_PORT` placeholders to serve as an example.
 
-### Use an external Elasticsearch server
+### External Elasticsearch server
 
-If you are using an external elasticsearch server rather than the embedded server or a linked container, simply provide a configuration file with the Elasticsearch endpoints already configured:
+If you are using an external Elasticsearch server rather than the embedded server or a linked container, simply provide a configuration file with the Elasticsearch endpoints already configured:
 
     $ docker run -d \
       -e LOGSTASH_CONFIG_URL=<your_logstash_config_url> \
@@ -91,14 +67,14 @@ You can now verify the logstash installation by visiting the prebuilt logstash d
 
     http://<your_container_ip>:9292/index.html#/dashboard/file/logstash.json
 
-## Test locally using Vagrant
+## Optional, build and run the image from source
 
-To build the image locally using Vagrant, you will first need to clone the repository:
+If you prefer to build from source rather than use the [pblittle/docker-logstash][1] trusted build published to the public Docker Registry, execute the following:
 
     $ git clone https://github.com/pblittle/docker-logstash.git
     $ cd docker-logstash
 
-Start and provision a virtual machine using the provided Vagrantfile:
+If you are using Vagrant, start and provision a virtual machine using the provided Vagrantfile:
 
     $ vagrant up
     $ vagrant ssh