Febbweiss/docker-curator
1
0
Fork 0
mirror of https://github.com/Febbweiss/docker-curator.git synced 2026-03-05 06:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Febbweiss:pr-22
Branches Tags
Febbweiss:master Febbweiss:pr-22
Febbweiss:5.4.0 Febbweiss:5.2.0 Febbweiss:5.1.1 Febbweiss:5.0.1 Febbweiss:4.2.6 Febbweiss:4.2.4 Febbweiss:4.2.1 Febbweiss:4.1.2 Febbweiss:4.0.4 Febbweiss:4.0.3 Febbweiss:4.0.1 Febbweiss:3.5.1 Febbweiss:3.5.0 Febbweiss:3.4.1 Febbweiss:3.4.0 Febbweiss:3.3.0 Febbweiss:3.2.0 Febbweiss:3.1.0 Febbweiss:3.0.3 Febbweiss:3.0.2 Febbweiss:3.0.1 Febbweiss:2.1.1 Febbweiss:2.0.2
...
compare: Febbweiss:master
Branches Tags
Febbweiss:master Febbweiss:pr-22
Febbweiss:5.4.0 Febbweiss:5.2.0 Febbweiss:5.1.1 Febbweiss:5.0.1 Febbweiss:4.2.6 Febbweiss:4.2.4 Febbweiss:4.2.1 Febbweiss:4.1.2 Febbweiss:4.0.4 Febbweiss:4.0.3 Febbweiss:4.0.1 Febbweiss:3.5.1 Febbweiss:3.5.0 Febbweiss:3.4.1 Febbweiss:3.4.0 Febbweiss:3.3.0 Febbweiss:3.2.0 Febbweiss:3.1.0 Febbweiss:3.0.3 Febbweiss:3.0.2 Febbweiss:3.0.1 Febbweiss:2.1.1 Febbweiss:2.0.2

7 Commits
pr-22 ... master

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
1 changed files with 2 additions and 1 deletions
Expand all files Collapse all files

3
Dockerfile
View File

@@ -1,7 +1,8 @@
FROM alpine:3.6 FROM alpine:3.6
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 && \ 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==5.4.0 && \ pip install elasticsearch-curator==5.4.0 && \
pip install boto3==1.4.8 && \
pip install requests-aws4auth==0.9 && \ pip install requests-aws4auth==0.9 && \
pip install cryptography==2.1.3 && \ pip install cryptography==2.1.3 && \
apk del py-pip gcc python-dev libffi-dev musl-dev linux-headers openssl-dev && \ apk del py-pip gcc python-dev libffi-dev musl-dev linux-headers openssl-dev && \