Merge branch 'deric-docker' into develop

Author: martijnrondeel

Dockerfile

@@ -1,14 +1,42 @@
-FROM ivankrizsan/elastalert AS py-ea
+FROM alpine:latest as py-ea
+ARG ELASTALERT_VERSION=v0.1.31
+ENV ELASTALERT_VERSION=${ELASTALERT_VERSION}
+# URL from which to download Elastalert.
+ARG ELASTALERT_URL=https://github.com/Yelp/elastalert/archive/$ELASTALERT_VERSION.zip
+ENV ELASTALERT_URL=${ELASTALERT_URL}
+# Elastalert home directory full path.
+ENV ELASTALERT_HOME /opt/elastalert
+
+WORKDIR /opt
+
+RUN apk add --update --no-cache ca-certificates openssl-dev openssl python2-dev python2 py2-pip py2-yaml libffi-dev gcc musl-dev wget && \
+# Download and unpack Elastalert.
+    wget -O elastalert.zip "${ELASTALERT_URL}" && \
+    unzip elastalert.zip && \
+    rm elastalert.zip && \
+    mv e* "${ELASTALERT_HOME}"
+
+WORKDIR "${ELASTALERT_HOME}"
+
+# Install Elastalert.
+# see: https://github.com/Yelp/elastalert/issues/1654
+RUN sed -i 's/jira>=1.0.10/jira>=1.0.10,<1.0.15/g' setup.py && \
+    python setup.py install && \
+    pip install -r requirements.txt
+
 FROM node:alpine
 LABEL maintainer="BitSensor <[email protected]>"
-EXPOSE 3030
+# Set this environment variable to True to set timezone on container start.
+ENV SET_CONTAINER_TIMEZONE False
+# Default container timezone as found under the directory /usr/share/zoneinfo/.
+ENV CONTAINER_TIMEZONE Etc/UTC
 
-RUN apk add --update --no-cache python2 curl make
+RUN apk add --update --no-cache curl tzdata python2 make
 
 COPY --from=py-ea /usr/lib/python2.7/site-packages /usr/lib/python2.7/site-packages
 COPY --from=py-ea /opt/elastalert /opt/elastalert
+COPY --from=py-ea /usr/bin/elastalert* /usr/bin/
 
-RUN mkdir server_data
 WORKDIR /opt/elastalert-server
 COPY . /opt/elastalert-server
 
@@ -18,4 +46,5 @@ COPY config/config.json config/config.json
 COPY rule_templates/ /opt/elastalert/rule_templates
 COPY elastalert_modules/ /opt/elastalert/elastalert_modules
 
+EXPOSE 3030
 ENTRYPOINT ["npm", "start"]

Makefile

@@ -0,0 +1,14 @@
+v ?= v0.1.31
+
+all: build
+
+build:
+	docker pull alpine:latest && docker pull node:alpine
+	docker build --build-arg ELASTALERT_VERSION=$(v) -t elastalert .
+
+server: build
+	docker run -it --rm -p 3030:3030 \
+	--net="host" \
+	elastalert:latest
+
+.PHONY: build

README.md

@@ -55,6 +55,33 @@ If you want to build the server and run the build version:
 
 You can then start the build by running `node lib/index.js`.
 
+
+
+## Building Docker image
+
+1. Clone the repository
+   ```bash
+   git clone https://github.com/bitsensor/elastalert.git && cd elastalert
+   ```
+2. Build the image using
+   ```
+   make build
+   ```
+   which is equivalent of:
+   ```
+   docker pull alpine:latest && docker pull node:latest
+   docker build -t elastalert .
+   ```
+
+Custom Yelp's Elastalert version (a [release from github](https://github.com/Yelp/elastalert/releases)) e.g. `master` or `v0.1.28`:
+```bash
+make build v=v0.1.28
+```
+Custom mirror:
+```bash
+docker build --build-arg ELASTALERT_URL=http://example.mirror.com/master.zip -t elastalert .
+```
+
 ### Install ElastAlert to /opt/elastalert
 And run `pip install -r requirements.txt` or read the installation guide of ElastAlert.