Merge branch '5.x'

Put 5.x branch back into master for now

.gitignore

@@ -1,24 +1,32 @@
-.*.swp
-*~
+*.egg
 *.py[co]
+*.zip
+*~
+.*.swp
+.DS_Store
+.coverage
+.eggs
+.idea
+.vscode
+Elastic.ico
+Vagrant/centos/6/.vagrant
+Vagrant/centos/7/.vagrant
+Vagrant/ubuntu/14.04/.vagrant
 build
+cacert.pem
+cover
+coverage.xml
 dist
-scratch
 docs/_build
-*.egg
-.eggs
+docs/asciidoc/html_docs
 elasticsearch_curator.egg-info
 elasticsearch_curator_dev.egg-info
-.coverage
-.idea
-coverage.xml
-nosetests.xml
 index.html
-docs/asciidoc/html_docs
-wheelhouse
-Elastic.ico
-vcruntime140.dll
 msi_guid.txt
-Vagrant/centos/6/.vagrant
-Vagrant/centos/7/.vagrant
-Vagrant/ubuntu/14.04/.vagrant
+nosetests.xml
+samples
+scratch
+test/.DS_Store
+vcruntime140.dll
+wheelhouse
+windows

.travis.yml

@@ -2,7 +2,6 @@ language: python
 
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
 
@@ -13,7 +12,10 @@ env:
   - ES_VERSION=5.3.3
   - ES_VERSION=5.4.3
   - ES_VERSION=5.5.2
-  - ES_VERSION=5.6.3
+  - ES_VERSION=5.6.8
+  - ES_VERSION=6.0.1
+  - ES_VERSION=6.1.3
+  - ES_VERSION=6.2.4
 
 os: linux
 
@@ -23,7 +25,14 @@ cache:
 jdk:
   - oraclejdk8
 
+before_install:
+  - cp requirements.txt ..
+  - cd ..
+  - pip install -r requirements.txt
+  - cd -
+
 install:
+  - pip install -U setuptools
   - pip install -r requirements.txt
   - pip install .
 

Dockerfile

@@ -1,8 +1,16 @@
-# Docker Definition for ElasticSearch Curator
+FROM python:3.6-alpine3.6 as builder
 
-FROM python:2.7.8-slim
-MAINTAINER Christian R. Vozar <christian@rogueethic.com>
+RUN apk --no-cache add build-base tar musl-utils openssl-dev
+RUN pip3 install setuptools cx_Freeze==6.0b1 requests-aws4auth boto3
 
-RUN pip install --quiet elasticsearch-curator
+COPY . .
+RUN ln -s /lib/libc.musl-x86_64.so.1 ldd
+RUN ln -s /lib /lib64
+RUN pip3 install -r requirements.txt 
+RUN python3 setup.py build_exe
 
-ENTRYPOINT [ "/usr/local/bin/curator" ]
+FROM alpine:3.6
+RUN apk --no-cache upgrade && apk --no-cache add ca-certificates
+COPY --from=builder build/exe.linux-x86_64-3.6 /curator/
+USER nobody:nobody
+ENTRYPOINT ["/curator/curator"]

curator/_version.py

@@ -1,2 +1 @@
-__version__ = '5.3.0'
-
+__version__ = '5.5.4'