From 3c1634b3d05632922928027ca310f10f76871c2d Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Tue, 10 Jan 2017 16:14:50 -0800 Subject: [PATCH] fix py2 Signed-off-by: Jess Frazelle --- ansible/Dockerfile | 2 +- awscli/Dockerfile | 2 +- certbot/Dockerfile | 2 +- cli53/Dockerfile | 2 +- couchpotato/Dockerfile | 2 +- dcos-cli/Dockerfile | 2 +- gcalcli/Dockerfile | 2 +- httpie/Dockerfile | 2 +- imagemin/Dockerfile | 20 ++++++++++++-------- wee-slack/Dockerfile | 2 +- 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ansible/Dockerfile b/ansible/Dockerfile index 4320855..82f5e6d 100644 --- a/ansible/Dockerfile +++ b/ansible/Dockerfile @@ -12,7 +12,7 @@ MAINTAINER Christian Koep RUN builddeps=' \ python-dev \ - py-pip \ + py2-pip \ musl-dev \ openssl-dev \ libffi-dev \ diff --git a/awscli/Dockerfile b/awscli/Dockerfile index 5b3a424..aa530f0 100644 --- a/awscli/Dockerfile +++ b/awscli/Dockerfile @@ -6,7 +6,7 @@ RUN apk --no-cache add \ groff \ less \ python \ - py-pip \ + py2-pip \ && pip install awscli \ && mkdir -p /root/.aws \ && { \ diff --git a/certbot/Dockerfile b/certbot/Dockerfile index f999398..9c43ffe 100644 --- a/certbot/Dockerfile +++ b/certbot/Dockerfile @@ -14,7 +14,7 @@ RUN apk --no-cache add \ py-mock \ py-openssl \ py-parsedatetime \ - py-pip \ + py2-pip \ py-requests \ py-rfc3339 \ py-setuptools \ diff --git a/cli53/Dockerfile b/cli53/Dockerfile index 83ef35e..b6fa439 100644 --- a/cli53/Dockerfile +++ b/cli53/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:latest RUN apk --no-cache add \ ca-certificates \ python \ - py-pip \ + py2-pip \ && pip install cli53 ENTRYPOINT [ "cli53" ] diff --git a/couchpotato/Dockerfile b/couchpotato/Dockerfile index 57336b0..c3ade44 100644 --- a/couchpotato/Dockerfile +++ b/couchpotato/Dockerfile @@ -24,7 +24,7 @@ RUN apk add --no-cache \ openssl-dev \ python \ python-dev \ - py-pip \ + py2-pip \ && rm -rf /var/lib/apt/lists/* RUN pip install \ diff --git a/dcos-cli/Dockerfile b/dcos-cli/Dockerfile index 895a856..d83cd7e 100644 --- a/dcos-cli/Dockerfile +++ b/dcos-cli/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Jessie Frazelle RUN apk --no-cache add \ ca-certificates \ python \ - py-pip \ + py2-pip \ && pip install dcoscli # path to the DCOS CLI binary diff --git a/gcalcli/Dockerfile b/gcalcli/Dockerfile index dae3ff0..88a5eae 100644 --- a/gcalcli/Dockerfile +++ b/gcalcli/Dockerfile @@ -6,7 +6,7 @@ ENV HOME /home/gcalcli RUN apk --no-cache add \ python \ python-dev \ - py-pip \ + py2-pip \ build-base \ && adduser -S gcalcli \ && chown -R gcalcli $HOME \ diff --git a/httpie/Dockerfile b/httpie/Dockerfile index 6ec1232..d5f8bb7 100644 --- a/httpie/Dockerfile +++ b/httpie/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Jessie Frazelle RUN apk --no-cache add \ ca-certificates \ python \ - py-pip \ + py2-pip \ && pip install httpie httpie-unixsocket ENTRYPOINT [ "http" ] diff --git a/imagemin/Dockerfile b/imagemin/Dockerfile index f779ee3..38645c8 100644 --- a/imagemin/Dockerfile +++ b/imagemin/Dockerfile @@ -6,17 +6,21 @@ # --entrypoint bash \ # jess/imagemin # -FROM alpine:latest +FROM node:alpine MAINTAINER Jessie Frazelle RUN apk --no-cache add \ - autoconf \ - automake \ - build-base \ file \ - libpng-dev \ - nasm \ - nodejs \ - && npm install --global imagemin-cli + libpng + +RUN set -x \ + && apk add --no-cache --virtual .build-deps \ + autoconf \ + automake \ + build-base \ + libpng-dev \ + nasm \ + && npm install --global imagemin-cli \ + && apk del .build-deps CMD [ "imagemin", "--help" ] diff --git a/wee-slack/Dockerfile b/wee-slack/Dockerfile index 59c6796..4fadd58 100644 --- a/wee-slack/Dockerfile +++ b/wee-slack/Dockerfile @@ -16,7 +16,7 @@ FROM alpine:latest RUN apk add --no-cache \ ca-certificates \ python \ - py-pip \ + py2-pip \ weechat \ weechat-perl \ weechat-python