29 Commits

Author SHA1 Message Date
Ivan Babrou
f98b9b5f1f Merge pull request #28 from r4j4h/search-guard
Fixed Search Guard Cert Support
2017-12-16 13:05:44 -08:00
Jasmine Hegman
b118d2a69e Lock boto3 to version that currently installs on 3.6 2017-12-12 23:10:00 -07:00
Jasmine Hegman
626e535d30 Merge branch 'github__upstream_master' into github_upstream_search-guard
* github__upstream_master:
  Revert "Merge pull request #22 from r4j4h/search-guard"

Conflicts:
	Dockerfile
2017-12-12 23:09:32 -07:00
Jasmine Hegman
3aaad20aa2 Specified libssl1.0 as intentional dependency so it is not removed 2017-12-12 23:03:01 -07:00
Jasmine Hegman
15cd022541 Removed removal of openssl-dev as in alpine 3.6 it causes libssl to be removed. 2017-12-12 22:41:44 -07:00
Ivan Babrou
76788184fc Revert "Merge pull request #22 from r4j4h/search-guard"
This reverts commit ba28dcf5f1, reversing
changes made to 10783cfded.
2017-12-12 00:18:59 -08:00
Ivan Babrou
ba28dcf5f1 Merge pull request #22 from r4j4h/search-guard
Enhanced to use openssl for Search guard cert support
2017-12-10 13:27:19 -08:00
Jasmine Hegman
0ddccae0c7 Enhanced to use openssl for Search guard cert support as per https://gist.github.com/floragunncom/9319a994ae09df64b2a173128f745ed2 2017-12-10 13:24:12 -08:00
Ivan Babrou
10783cfded Merge pull request #25 from ben-st/patch-1
bump alpine version, switch to --no-cache
2017-12-04 08:36:29 -08:00
Benjamin
7d0fee7a67 merge current master 2017-12-04 17:32:40 +01:00
Ivan Babrou
7db7562586 Merge pull request #26 from phillbaker/patch-1
Install boto3 to add support for environment credentials
2017-11-27 17:14:38 -08:00
Phillip Baker
88bd6eba6a Install boto3 to add support for environment credentials
Support for AWS credentials was updated in https://github.com/elastic/curator/pull/1084 in curator >=5.3.0.

Updates https://github.com/bobrik/docker-curator/pull/19.
2017-11-27 18:49:31 -05:00
Ivan Babrou
965f8caa7c Merge pull request #24 from la3mmchen/master
move curator version to 5.4
2017-11-26 14:07:15 -08:00
Benjamin
94edc4b080 bump alpine version, switch to --no-cache
You can use the --no-cache option to apk, then you don't have to delete the package cache afterwards.

All the best,

Benjamin
2017-11-23 09:37:18 +01:00
Alexander Koehler
90e39b4d93 move curator version to 5.4 2017-11-22 11:20:19 +01:00
Ivan Babrou
4c6fbe62a2 Merge pull request #21 from sdurrheimer/master
Update to 5.2.0
2017-09-30 15:26:48 -07:00
Steve Durrheimer
4a6d46bb4c Update to 5.2.0 2017-09-14 09:10:12 +02:00
Ivan Babrou
07e96e9ebb Merge pull request #20 from iyesin/drop-privs
Drop privileges
2017-08-24 14:53:44 +01:00
Ilya Yesin
b8618822c2 Drop privileges
Just drop privileges
2017-08-24 15:51:38 +02:00
Ivan Babrou
8dbe4fe949 Merge pull request #19 from aianus/support_aws_es
Include requests-aws4auth in image for AWS ES support
2017-08-20 17:08:00 -07:00
Alex Ianus
8b21401758 Include requests-aws4auth in image for AWS ES support 2017-08-14 16:11:09 -04:00
Ivan Babrou
90e5da42a3 Merge pull request #17 from hbarrington/master
Update to 5.1.1
2017-06-18 12:55:12 -07:00
Hunter Barrington
69bfe3f7e4 Update Dockerfile 2017-06-16 14:56:25 -04:00
Ivan Babrou
c7693168aa Merge pull request #16 from jasonswat/5.0.1
Update to 5.0.1
2017-04-23 19:33:22 -07:00
Swatniki, Jason
fc9212e6bb Update to 5.0.1 2017-04-13 14:18:14 -07:00
Ivan Babrou
8b88da9ea1 Merge pull request #15 from kim0/patch-1
Upgrade curator to 4.2.6
2017-01-29 21:29:36 -08:00
Ahmed Kamal
6281db1564 Upgrade curator to 4.2.6 2017-01-28 14:03:49 +02:00
Ivan Babrou
e4e4c9deba Merge pull request #14 from davidkarlsen/master
Update to 4.2.4
2016-12-10 23:35:28 -08:00
David J. M. Karlsen
ff903609f0 Update to 4.2.4 2016-12-11 01:33:35 +01:00

View File

@@ -1,8 +1,15 @@
FROM alpine:3.4 FROM alpine:3.6
RUN apk --update add python py-setuptools py-pip && \ RUN apk --no-cache add python py-setuptools py-pip gcc libffi py-cffi python-dev libffi-dev py-openssl musl-dev linux-headers openssl-dev libssl1.0 && \
pip install elasticsearch-curator==4.2.1 && \ pip install elasticsearch-curator==5.4.0 && \
apk del py-pip && \ pip install boto3==1.4.8 && \
rm -rf /var/cache/apk/* pip install requests-aws4auth==0.9 && \
pip install cryptography==2.1.3 && \
apk del py-pip gcc python-dev libffi-dev musl-dev linux-headers openssl-dev && \
sed -i '/import sys/a urllib3.contrib.pyopenssl.inject_into_urllib3()' /usr/bin/curator && \
sed -i '/import sys/a import urllib3.contrib.pyopenssl' /usr/bin/curator && \
sed -i '/import sys/a import urllib3' /usr/bin/curator
USER nobody:nobody
ENTRYPOINT ["/usr/bin/curator"] ENTRYPOINT ["/usr/bin/curator"]