From 3913d437ac282097e8f7b4c1e64264810bacb0c3 Mon Sep 17 00:00:00 2001 From: Ivan Lisenkov Date: Fri, 16 Sep 2016 00:02:54 -0400 Subject: [PATCH 1/3] Port to alpine --- Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d75ce9c..498f560 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,13 @@ -FROM ubuntu:trusty -MAINTAINER Simon Templer +FROM alpine:edge +MAINTAINER Simon Templer Ivan Lisenkov + +# RUN echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \ +# apk add --update --no-cache curl awscli@testing bash grep +# RUN apt-get update && apt-get install -y python-pip curl && pip install awscli + +RUN apk add --update --no-cache curl bash grep python3 py3-pip ca-certificates tzdata tar && \ + pip3 install awscli -RUN apt-get update && apt-get install -y python-pip curl && pip install awscli ADD /scripts /dockup/ RUN chmod 755 /dockup/*.sh From ddd4e09ef1153fb6c636b3d4909e8848ba9caa81 Mon Sep 17 00:00:00 2001 From: Ivan Lisenkov Date: Fri, 16 Sep 2016 00:32:49 -0400 Subject: [PATCH 2/3] Fix encryption under alpine --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 498f560..06880b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Simon Templer Ivan Lisenkov # RUN echo '@testing http://nl.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \ # apk add --update --no-cache curl awscli@testing bash grep # RUN apt-get update && apt-get install -y python-pip curl && pip install awscli -RUN apk add --update --no-cache curl bash grep python3 py3-pip ca-certificates tzdata tar && \ +RUN apk add --update --no-cache curl bash grep python3 py3-pip ca-certificates tzdata tar gnupg && \ pip3 install awscli From 7e7dbc9421ca2d53fce90e6def1b5e5b72826d12 Mon Sep 17 00:00:00 2001 From: Ivan Lisenkov Date: Fri, 16 Sep 2016 00:46:10 -0400 Subject: [PATCH 3/3] Switch back to python2 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 06880b9..38cd0ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ MAINTAINER Simon Templer Ivan Lisenkov # apk add --update --no-cache curl awscli@testing bash grep # RUN apt-get update && apt-get install -y python-pip curl && pip install awscli -RUN apk add --update --no-cache curl bash grep python3 py3-pip ca-certificates tzdata tar gnupg && \ - pip3 install awscli +RUN apk add --update --no-cache curl bash grep python py-pip ca-certificates tzdata tar gnupg && \ + pip install awscli ADD /scripts /dockup/