From 15cd022541d0f33fcf83622c9766c68d2a426a06 Mon Sep 17 00:00:00 2001 From: Jasmine Hegman Date: Tue, 12 Dec 2017 22:41:44 -0700 Subject: [PATCH 1/3] Removed removal of openssl-dev as in alpine 3.6 it causes libssl to be removed. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2fa74b5..79fa547 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN apk --no-cache add python py-setuptools py-pip gcc libffi py-cffi python-dev pip install elasticsearch-curator==5.4.0 && \ 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 && \ + apk del py-pip gcc python-dev libffi-dev musl-dev linux-headers && \ 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 From 3aaad20aa2f1407fc556500834536e3b04f907be Mon Sep 17 00:00:00 2001 From: Jasmine Hegman Date: Tue, 12 Dec 2017 23:03:01 -0700 Subject: [PATCH 2/3] Specified libssl1.0 as intentional dependency so it is not removed --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 79fa547..27f2f22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ 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 requests-aws4auth==0.9 && \ pip install cryptography==2.1.3 && \ - apk del py-pip gcc python-dev libffi-dev musl-dev linux-headers && \ + 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 From b118d2a69efd222e41a22faa5392b1c29f36f86d Mon Sep 17 00:00:00 2001 From: Jasmine Hegman Date: Tue, 12 Dec 2017 23:10:00 -0700 Subject: [PATCH 3/3] Lock boto3 to version that currently installs on 3.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0e010e8..2955a0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ 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 libssl1.0 && \ pip install elasticsearch-curator==5.4.0 && \ - pip install boto3 && \ + pip install boto3==1.4.8 && \ 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 && \