From d96d372830b5d445204d2f75806d5143dec40c27 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Sun, 26 Jul 2015 20:46:56 -0700 Subject: [PATCH] convert some to alpine Signed-off-by: Jessica Frazelle --- cf-reset-cache/Dockerfile | 17 ++++++++++++----- cf-reset-cache/reset-cache.py | 0 gcalcli/Dockerfile | 16 +++++++++++----- htop/Dockerfile | 7 +++---- httpie/Dockerfile | 11 +++++++++-- imagemagick/Dockerfile | 7 +++---- 6 files changed, 38 insertions(+), 20 deletions(-) mode change 100644 => 100755 cf-reset-cache/reset-cache.py diff --git a/cf-reset-cache/Dockerfile b/cf-reset-cache/Dockerfile index 82211bc..9ea8cca 100644 --- a/cf-reset-cache/Dockerfile +++ b/cf-reset-cache/Dockerfile @@ -1,9 +1,16 @@ -FROM python:2.7.8 +FROM alpine:latest MAINTAINER Jessica Frazelle -RUN pip install boto +RUN apk update && apk add \ + ca-certificates \ + openssl \ + python \ + python-dev \ + py-pip \ + build-base \ + && rm -rf /var/cache/apk/* \ + && pip install boto -ADD reset-cache.py /bin/reset-cache -RUN chmod +x /bin/reset-cache +COPY ./reset-cache.py /bin/reset-cache.py -CMD [ "reset-cache" ] \ No newline at end of file +CMD [ "/usr/bin/python", "/bin/reset-cache.py" ] diff --git a/cf-reset-cache/reset-cache.py b/cf-reset-cache/reset-cache.py old mode 100644 new mode 100755 diff --git a/gcalcli/Dockerfile b/gcalcli/Dockerfile index b3e5a5c..e025c66 100644 --- a/gcalcli/Dockerfile +++ b/gcalcli/Dockerfile @@ -1,13 +1,19 @@ -FROM python:2.7.8 +FROM alpine:latest MAINTAINER Jessica Frazelle ENV HOME /home/gcalcli -RUN useradd --create-home --home-dir $HOME gcalcli \ - && chown -R gcalcli:gcalcli $HOME -RUN pip install vobject parsedatetime gcalcli +RUN apk update && apk add \ + python \ + python-dev \ + py-pip \ + build-base \ + && rm -rf /var/cache/apk/* \ + && adduser -S gcalcli \ + && chown -R gcalcli $HOME \ + && pip install vobject parsedatetime gcalcli WORKDIR $HOME USER gcalcli -ENTRYPOINT [ "/usr/local/bin/gcalcli" ] +ENTRYPOINT [ "gcalcli" ] diff --git a/htop/Dockerfile b/htop/Dockerfile index 4594b73..9a930af 100644 --- a/htop/Dockerfile +++ b/htop/Dockerfile @@ -4,12 +4,11 @@ # --pid host \ # jess/htop # -FROM debian:sid +FROM alpine:latest MAINTAINER Jessica Frazelle -RUN apt-get update && apt-get install -y \ +RUN apk update && apk add \ htop \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/cache/apk/* CMD [ "htop" ] diff --git a/httpie/Dockerfile b/httpie/Dockerfile index 40631bb..5034c83 100644 --- a/httpie/Dockerfile +++ b/httpie/Dockerfile @@ -1,6 +1,13 @@ -FROM python:2.7.8 +FROM alpine:latest MAINTAINER Jessica Frazelle -RUN pip install httpie httpie-unixsocket +RUN apk update && apk add \ + ca-certificates \ + python \ + python-dev \ + py-pip \ + build-base \ + && rm -rf /var/cache/apk/* \ + && pip install httpie httpie-unixsocket ENTRYPOINT [ "http" ] diff --git a/imagemagick/Dockerfile b/imagemagick/Dockerfile index 834fa7c..f5f4eb4 100644 --- a/imagemagick/Dockerfile +++ b/imagemagick/Dockerfile @@ -1,9 +1,8 @@ -FROM debian:sid +FROM alpine:latest MAINTAINER Jessica Frazelle -RUN apt-get update && apt-get install -y \ +RUN apk update && apk add \ imagemagick \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/cache/apk/* CMD [ "echo", "Use one of the following commands [ animate | compare | composite | conjure | convert | display | identify | import | mogrify | montage | stream ]" ]