Merge branch 'release/0.13.0'

Author: pblittle

1.4/Makefile

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

1.4/base/bin/boot

@@ -35,7 +35,7 @@ function main() {
 
     # Fire up logstash!
     #
-    logstash_start_agent
+    logstash_start_agent "$@"
 }
 
 main "$@"

1.4/base/logstash.sh

@@ -72,13 +72,41 @@ function logstash_create_log_dir() {
 }
 
 function logstash_start_agent() {
+    local binary="$LOGSTASH_BINARY"
     local config_dir="$LOGSTASH_CONFIG_DIR"
     local log_file="$LOGSTASH_LOG_FILE"
 
-    exec "$LOGSTASH_BINARY" \
-         agent \
-         --config "$config_dir" \
-         --log "$log_file" \
-         -- \
-         web
+    case "$1" in
+    # run just the agent
+    'agent')
+        exec "$binary" \
+             agent \
+             --config "$config_dir" \
+             --log "$log_file" \
+             --
+        ;;
+    # test the logstash configuration
+    'configtest')
+        exec "$binary" \
+             agent \
+             --config "$config_dir" \
+             --log "$log_file" \
+             --configtest \
+             --
+        ;;
+    # run just the web
+    'web')
+        exec "$binary" \
+             web
+        ;;
+    # run agent+web (default operation)
+    *)
+        exec "$binary" \
+             agent \
+             --config "$config_dir" \
+             --log "$log_file" \
+             -- \
+             web
+        ;;
+    esac
 }

1.4/test/Makefile

@@ -1,5 +1,5 @@
 NAME = pblittle/docker-logstash-test
-VERSION = 0.12.1
+VERSION = 0.13.0
 
 BUILD_SRC = ${CURDIR}/../base
 
@@ -29,3 +29,12 @@ test-elasticsearch-linked: build
 	fig rm && \
 	fig build && \
 	fig up
+
+.PHONY: test-logstash-configtest
+test-logstash-configtest: build
+
+	cd ${CURDIR}/logstash-configtest && \
+	fig stop && \
+	fig rm && \
+	fig build && \
+	fig up

1.4/test/elasticsearch-embedded/Dockerfile

@@ -1,4 +1,4 @@
-FROM pblittle/docker-logstash:0.12.1
+FROM pblittle/docker-logstash:0.13.0
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)
 
 # Download packages required to run the test suite

1.4/test/elasticsearch-linked/Dockerfile

@@ -1,4 +1,4 @@
-FROM pblittle/docker-logstash:0.12.1
+FROM pblittle/docker-logstash:0.13.0
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)
 
 # Download packages required to run the test suite

1.4/test/logstash-configtest/Dockerfile

@@ -0,0 +1,29 @@
+FROM pblittle/docker-logstash:0.13.0
+MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)
+
+# Download packages required to run the test suite
+#
+RUN apt-get update \
+    && apt-get install -yq \
+        apt-utils \
+        git \
+        net-tools \
+        telnet \
+        --no-install-recommends \
+    && rm -rf /var/cache/apt/* \
+    && rm -rf /var/lib/apt/lists/*
+
+# Download and install BATS test framework
+#
+RUN git clone https://github.com/sstephenson/bats.git /tmp/bats \
+    && /tmp/bats/install.sh /usr/local \
+    && rm -rf /tmp/bats
+
+# $TERM needs to be set for bats
+#
+ENV TERM xterm-256color
+
+WORKDIR /app
+ADD test.bats /app/test.bats
+
+CMD []

1.4/test/logstash-configtest/fig.yml

@@ -0,0 +1,12 @@
+---
+elasticsearch:
+  image: dockerfile/elasticsearch
+  ports:
+    - '9200:9200'
+    - '9300:9300'
+  command: '/elasticsearch/bin/elasticsearch -Des.http.cors.enabled=true'
+
+logstash:
+  build: .
+  environment:
+    LOGSTASH_TRACE: true